grrrrrr
This commit is contained in:
		
							parent
							
								
									06c531589a
								
							
						
					
					
						commit
						9692fc7f99
					
				
					 8 changed files with 44 additions and 70 deletions
				
			
		| 
						 | 
				
			
			@ -125,7 +125,7 @@
 | 
			
		|||
          modules = [
 | 
			
		||||
            (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
 | 
			
		||||
            ./systems/nixbook/configuration.nix
 | 
			
		||||
            nixos-hardware.nixosModules.dell-inspiron-7405
 | 
			
		||||
            nixos-hardware.nixosModules.common-cpu-amd
 | 
			
		||||
          ];
 | 
			
		||||
        };
 | 
			
		||||
        syl = lib.nixosSystem {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -87,17 +87,17 @@ in {
 | 
			
		|||
        "audio/opus" = "mpv-slow.desktop";
 | 
			
		||||
        "audio/x-opus" = "mpv-slow.desktop";
 | 
			
		||||
        "audio/x-opus+ogg" = "mpv-slow.desktop";
 | 
			
		||||
        "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "text/html" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/http" = "librewolf.desktop";
 | 
			
		||||
        "x-scheme-handler/https" = "librewolf.desktop";
 | 
			
		||||
        "text/html" = "librewolf.desktop";
 | 
			
		||||
        "text/org" = "emacsclient.desktop";
 | 
			
		||||
        "text/md" = "emacsclient.desktop";
 | 
			
		||||
        "text/txt" = "emacsclient.desktop";
 | 
			
		||||
        "text/rs" = "emacsclient.desktop";
 | 
			
		||||
        "text/plain" = "emacsclient.desktop";
 | 
			
		||||
        "application/pdf" = "okular.desktop";
 | 
			
		||||
        "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/about" = "librewolf.desktop";
 | 
			
		||||
        "x-scheme-handler/unknown" = "librewolf.desktop";
 | 
			
		||||
        "x-scheme-handler/magnet" = "torrent.desktop";
 | 
			
		||||
        "application/vnd.openxmlformats-officedocuments.spreadsheetml.sheet" = "libreoffice.desktop";
 | 
			
		||||
      };
 | 
			
		||||
| 
						 | 
				
			
			@ -127,17 +127,17 @@ in {
 | 
			
		|||
        "audio/flac" = "mpv-slow.desktop";
 | 
			
		||||
        "audio/wav" = "mpv-slow.desktop";
 | 
			
		||||
        "audio/opus" = "mpv-slow.desktop";
 | 
			
		||||
        "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "text/html" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/http" = "librewolf.desktop";
 | 
			
		||||
        "x-scheme-handler/https" = "librewolf.desktop";
 | 
			
		||||
        "text/html" = "librewolf.desktop";
 | 
			
		||||
        "text/org" = "emacsclient.desktop";
 | 
			
		||||
        "text/md" = "emacsclient.desktop";
 | 
			
		||||
        "text/txt" = "emacsclient.desktop";
 | 
			
		||||
        "text/rs" = "emacsclient.desktop";
 | 
			
		||||
        "text/plain" = "emacsclient.desktop";
 | 
			
		||||
        "application/pdf" = "okular.desktop";
 | 
			
		||||
        "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
 | 
			
		||||
        "x-scheme-handler/about" = "librewolf.desktop";
 | 
			
		||||
        "x-scheme-handler/unknown" = "librewolf.desktop";
 | 
			
		||||
        "x-scheme-handler/magnet" = "torrent.desktop";
 | 
			
		||||
        "application/vnd.openxmlformats-officedocuments.spreadsheetml.sheet" = "libreoffice.desktop";
 | 
			
		||||
      };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -96,9 +96,9 @@ in
 | 
			
		|||
      in {
 | 
			
		||||
        "XF86AudioRaiseVolume".action.spawn = ["pamixer" "--allow-boost" "-i" "5"];
 | 
			
		||||
        "XF86AudioLowerVolume".action.spawn = ["pamixer" "--allow-boost" "-d" "5"];
 | 
			
		||||
        "Super+E".action = sh ''${pkgs.nushell}/bin/nu /home/chris/bin/nirilof emacs "emacslient -c"'';
 | 
			
		||||
        "Super+E".action = spawn ["${pkgs.nushell}/bin/nu" "niriemacslof"];
 | 
			
		||||
        "Super+Return".action.spawn = "alacritty";
 | 
			
		||||
        "Super+B".action = spawn ["${pkgs.nushell}/bin/nu" "/home/chris/bin/nirilof" "org.qutebrowser.qutebrowser" "qutebrowser"];
 | 
			
		||||
        "Super+B".action = spawn ["${pkgs.nushell}/bin/nu" "nirifflof"];
 | 
			
		||||
        "Super+Alt+Space".action.spawn = "${pkgs.cosmic-launcher}/bin/cosmic-launcher";
 | 
			
		||||
        "Super+Space".action.spawn = ["${pkgs.fish}/bin/fish" "-c" "rofi -no-lazy-grab -modi combi -show combi -combi-modi drun,run"];
 | 
			
		||||
        "Super+Shift+W".action.spawn = "rofi -i -show window";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1 @@
 | 
			
		|||
Subproject commit 63ec2f6b300977b057400584b0de8082015eaaa9
 | 
			
		||||
Subproject commit ff5879f6200db4f3ceddd12b8d3683985f41da98
 | 
			
		||||
							
								
								
									
										3
									
								
								scripts/niriemacslof
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								scripts/niriemacslof
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
#/usr/bin/env nu
 | 
			
		||||
 | 
			
		||||
nu nirilof emacs 'emacsclient -c'
 | 
			
		||||
							
								
								
									
										3
									
								
								scripts/nirifflof
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								scripts/nirifflof
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
#/usr/bin/env nu
 | 
			
		||||
 | 
			
		||||
nu nirilof lw 'librewolf --name lw'
 | 
			
		||||
| 
						 | 
				
			
			@ -8,14 +8,14 @@
 | 
			
		|||
    ../../modules/base.nix
 | 
			
		||||
  ];
 | 
			
		||||
  networking.hostName = "nixbook";
 | 
			
		||||
 | 
			
		||||
  isoImage.squashfsCompression = "gzip -Xcompression-level 1";
 | 
			
		||||
  # boot.initrd.kernelModules = [ "i915" ];
 | 
			
		||||
  hardware.cpu.amd.updateMicrocode =
 | 
			
		||||
    lib.mkDefault config.hardware.enableRedistributableFirmware;
 | 
			
		||||
 | 
			
		||||
  hardware.acpilight.enable = lib.mkDefault true;
 | 
			
		||||
  networking.interfaces.wlp170s0.useDHCP = true;
 | 
			
		||||
  networking.useDHCP = false;
 | 
			
		||||
  # networking.interfaces.wlp170s0.useDHCP = true;
 | 
			
		||||
  # networking.useDHCP = false;
 | 
			
		||||
  hardware.uinput.enable = true;
 | 
			
		||||
  hardware.bluetooth.enable = true;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -27,29 +27,19 @@
 | 
			
		|||
  boot.supportedFilesystems = [ "ntfs" ];
 | 
			
		||||
 | 
			
		||||
  services = {
 | 
			
		||||
    desktopManager.plasma6.enable = true;
 | 
			
		||||
    desktopManager.cosmic.enable = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  services.displayManager.cosmic-greeter = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  programs.nix-ld.enable = true;
 | 
			
		||||
  security.pam.services.kwallet = {
 | 
			
		||||
    name = "kwallet";
 | 
			
		||||
    enableKwallet = true;
 | 
			
		||||
  };
 | 
			
		||||
  # security.pam.services.kwallet = {
 | 
			
		||||
  #   name = "kwallet";
 | 
			
		||||
  #   enableKwallet = true;
 | 
			
		||||
  # };
 | 
			
		||||
 | 
			
		||||
  systemd = {
 | 
			
		||||
    oomd = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      enableRootSlice = true;
 | 
			
		||||
      enableUserSlices = true;
 | 
			
		||||
      enableSystemSlice = true;
 | 
			
		||||
    };
 | 
			
		||||
    settings.Manager = {
 | 
			
		||||
      DefaultIOAccounting = true;
 | 
			
		||||
      DefaultIPAccounting = true;
 | 
			
		||||
      DefaultTimeoutStopSec = "10s";
 | 
			
		||||
      DefaultTimeoutStartSec = "10s";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  fonts.packages = with pkgs; [
 | 
			
		||||
    nerd-fonts.victor-mono
 | 
			
		||||
    noto-fonts
 | 
			
		||||
| 
						 | 
				
			
			@ -66,11 +56,6 @@
 | 
			
		|||
    greetd.enableKwallet = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  services.displayManager.sddm = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    wayland.enable = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  xdg.portal = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
 | 
			
		||||
| 
						 | 
				
			
			@ -97,9 +82,6 @@
 | 
			
		|||
 | 
			
		||||
  environment.variables = {
 | 
			
		||||
    SAL_USE_VCLPLUGIN = "kf5";
 | 
			
		||||
    EDITOR = "emacsclient -t -a";
 | 
			
		||||
    VISUAL = "emacsclient -c -a";
 | 
			
		||||
    QT_LOGGING_RULES = "js=true; kwin_*.debug=true";
 | 
			
		||||
    # GTK_USE_PORTAL = "1";
 | 
			
		||||
    # Fixing Qt apps in other environments
 | 
			
		||||
    # Thought I needed this but apparently they are working fine without it.
 | 
			
		||||
| 
						 | 
				
			
			@ -182,18 +164,18 @@
 | 
			
		|||
    ];
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  systemd.services.display-manager = {
 | 
			
		||||
    wants = [
 | 
			
		||||
      "systemd-user-sessions.service"
 | 
			
		||||
      "multi-user.target"
 | 
			
		||||
      "network-online.target"
 | 
			
		||||
    ];
 | 
			
		||||
    after = [
 | 
			
		||||
      "systemd-user-sessions.service"
 | 
			
		||||
      "multi-user.target"
 | 
			
		||||
      "network-online.target"
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
  # systemd.services.display-manager = {
 | 
			
		||||
  #   wants = [
 | 
			
		||||
  #     "systemd-user-sessions.service"
 | 
			
		||||
  #     "multi-user.target"
 | 
			
		||||
  #     "network-online.target"
 | 
			
		||||
  #   ];
 | 
			
		||||
  #   after = [
 | 
			
		||||
  #     "systemd-user-sessions.service"
 | 
			
		||||
  #     "multi-user.target"
 | 
			
		||||
  #     "network-online.target"
 | 
			
		||||
  #   ];
 | 
			
		||||
  # };
 | 
			
		||||
 | 
			
		||||
  # Enable touchpad support (enabled default in most desktopManager).
 | 
			
		||||
  services.libinput.enable = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,18 +43,7 @@
 | 
			
		|||
    hunspellDicts.en_US-large
 | 
			
		||||
    openssh
 | 
			
		||||
    openssl
 | 
			
		||||
    kdePackages.ark
 | 
			
		||||
    kdePackages.breeze
 | 
			
		||||
    kdePackages.dolphin
 | 
			
		||||
    xdg-utils
 | 
			
		||||
    kdePackages.kio-fuse
 | 
			
		||||
    kdePackages.kio-extras
 | 
			
		||||
    kdePackages.ffmpegthumbs
 | 
			
		||||
    kdePackages.kdegraphics-thumbnailers
 | 
			
		||||
    kdePackages.kdesdk-thumbnailers
 | 
			
		||||
    kdePackages.okular
 | 
			
		||||
    kdePackages.discover
 | 
			
		||||
    kdePackages.sddm-kcm
 | 
			
		||||
    hardinfo2
 | 
			
		||||
    # scribus
 | 
			
		||||
    brightnessctl
 | 
			
		||||
| 
						 | 
				
			
			@ -65,14 +54,12 @@
 | 
			
		|||
    aria2
 | 
			
		||||
    kdePackages.kwallet
 | 
			
		||||
    # nerd-fonts.victor-mono
 | 
			
		||||
    kdePackages.plasma-browser-integration
 | 
			
		||||
    glxinfo
 | 
			
		||||
    vulkan-tools
 | 
			
		||||
    wayland-utils
 | 
			
		||||
    nextcloud-client
 | 
			
		||||
    papirus-icon-theme
 | 
			
		||||
    phinger-cursors
 | 
			
		||||
    kdePackages.kde-cli-tools
 | 
			
		||||
    gzip
 | 
			
		||||
    # virt-viewer
 | 
			
		||||
    # inkscape
 | 
			
		||||
| 
						 | 
				
			
			@ -92,7 +79,6 @@
 | 
			
		|||
    # gimp
 | 
			
		||||
    power-profiles-daemon
 | 
			
		||||
    python3
 | 
			
		||||
    kdePackages.plasma-sdk
 | 
			
		||||
    wireguard-tools
 | 
			
		||||
    # cosmic-settings
 | 
			
		||||
  ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue