fix suspend and move to labels instead of uuids
This commit is contained in:
		
							parent
							
								
									d7ad065581
								
							
						
					
					
						commit
						dbada43f82
					
				
					 4 changed files with 26 additions and 5 deletions
				
			
		| 
						 | 
					@ -32,6 +32,7 @@
 | 
				
			||||||
          home-manager.useGlobalPkgs = true;
 | 
					          home-manager.useGlobalPkgs = true;
 | 
				
			||||||
          home-manager.useUserPackages = true;
 | 
					          home-manager.useUserPackages = true;
 | 
				
			||||||
          home-manager.users.lelgenio = import ./user/home.nix;
 | 
					          home-manager.users.lelgenio = import ./user/home.nix;
 | 
				
			||||||
 | 
					          home-manager.backupFileExtension = "bkp";
 | 
				
			||||||
          # Optionally, use home-manager.extraSpecialArgs to pass
 | 
					          # Optionally, use home-manager.extraSpecialArgs to pass
 | 
				
			||||||
          # arguments to home.nix
 | 
					          # arguments to home.nix
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										15
									
								
								log
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								log
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,15 @@
 | 
				
			||||||
 | 
					$ nix --extra-experimental-features nix-command flakes build --out-link /tmp/nixos-rebuild.rAHLyE/nixos-rebuild .#nixosConfigurations."monolith".config.system.build.nixos-rebuild --verbose
 | 
				
			||||||
 | 
					warning: Git tree '/home/lelgenio/projects/nixos-config' is dirty
 | 
				
			||||||
 | 
					evaluating file '/nix/store/vqny2ayx5bjs9w29n0kimmxq2rax061b-source/flake.nix'
 | 
				
			||||||
 | 
					$ exec /nix/store/n05m4wrq8hiwlv1n87q5zfvv4ginp299-nixos-rebuild/bin/nixos-rebuild switch --verbose --flake .#
 | 
				
			||||||
 | 
					building the system configuration...
 | 
				
			||||||
 | 
					Building in flake mode.
 | 
				
			||||||
 | 
					$ nix --extra-experimental-features nix-command flakes build .#nixosConfigurations."monolith".config.system.build.toplevel --verbose --out-link /tmp/nixos-rebuild.3us5Ex/result
 | 
				
			||||||
 | 
					warning: Git tree '/home/lelgenio/projects/nixos-config' is dirty
 | 
				
			||||||
 | 
					evaluating file '/nix/store/vqny2ayx5bjs9w29n0kimmxq2rax061b-source/flake.nix'
 | 
				
			||||||
 | 
					$ sudo --preserve-env=NIXOS_INSTALL_BOOTLOADER -- nix-env -p /nix/var/nix/profiles/system --set /nix/store/zghfi9sjbzjczd21ksnfxys76cqggirq-nixos-system-monolith-22.05.20220714.c06d5fa
 | 
				
			||||||
 | 
					$ sudo --preserve-env=NIXOS_INSTALL_BOOTLOADER -- /nix/store/zghfi9sjbzjczd21ksnfxys76cqggirq-nixos-system-monolith-22.05.20220714.c06d5fa/bin/switch-to-configuration switch
 | 
				
			||||||
 | 
					leaving systemd-boot 250.4 in place (250.4 is not newer)
 | 
				
			||||||
 | 
					stopping the following units: -.mount, boot-efi.mount, home.mount
 | 
				
			||||||
 | 
					Failed to stop -.mount: Job type stop is not applicable for unit -.mount.
 | 
				
			||||||
 | 
					Terminated
 | 
				
			||||||
| 
						 | 
					@ -63,7 +63,7 @@ in
 | 
				
			||||||
  services.greetd =  let
 | 
					  services.greetd =  let
 | 
				
			||||||
    swayConfig = pkgs.writeText "greetd-sway-config" ''
 | 
					    swayConfig = pkgs.writeText "greetd-sway-config" ''
 | 
				
			||||||
      # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
 | 
					      # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
 | 
				
			||||||
      exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway; swaymsg exit"
 | 
					      exec "XDG_CURRENT_DESKTOP=sway GTK_THEME=Orchis-Red-Dark-Compact ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway; swaymsg exit"
 | 
				
			||||||
      bindsym Mod4+shift+e exec swaynag \
 | 
					      bindsym Mod4+shift+e exec swaynag \
 | 
				
			||||||
        -t warning \
 | 
					        -t warning \
 | 
				
			||||||
        -m 'What do you want to do?' \
 | 
					        -m 'What do you want to do?' \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,26 +14,31 @@
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/" =
 | 
					  fileSystems."/" =
 | 
				
			||||||
    { device = "/dev/disk/by-uuid/876ccabe-511b-4cd4-9d4e-5da899c940ca";
 | 
					    { device = "/dev/disk/by-label/BTRFS_ROOT";
 | 
				
			||||||
      fsType = "btrfs";
 | 
					      fsType = "btrfs";
 | 
				
			||||||
      options = [ "subvol=nixos" ];
 | 
					      options = [ "subvol=nixos" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  boot.initrd.luks.devices."main".device = "/dev/disk/by-uuid/325ca6b7-0bcd-469d-bfb1-ba5667342871";
 | 
					  boot.initrd.luks.devices."main".device = "/dev/disk/by-label/CRYPTROOT";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/boot/efi" =
 | 
					  fileSystems."/boot/efi" =
 | 
				
			||||||
    { device = "/dev/disk/by-uuid/FF2D-8819";
 | 
					    { device = "/dev/disk/by-label/NIXBOOT";
 | 
				
			||||||
      fsType = "vfat";
 | 
					      fsType = "vfat";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/home" =
 | 
					  fileSystems."/home" =
 | 
				
			||||||
    { device = "/dev/disk/by-uuid/876ccabe-511b-4cd4-9d4e-5da899c940ca";
 | 
					    { device = "/dev/disk/by-label/BTRFS_ROOT";
 | 
				
			||||||
      fsType = "btrfs";
 | 
					      fsType = "btrfs";
 | 
				
			||||||
      options = [ "subvol=home" ];
 | 
					      options = [ "subvol=home" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  swapDevices = [ ];
 | 
					  swapDevices = [ ];
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
 | 
					  # TODO: desativar o GPP0 no wakeup acpi
 | 
				
			||||||
 | 
					  services.udev.extraRules = ''
 | 
				
			||||||
 | 
					    ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled"
 | 
				
			||||||
 | 
					  '';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
 | 
					  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
 | 
				
			||||||
  # (the default) this is the recommended approach. When using systemd-networkd it's
 | 
					  # (the default) this is the recommended approach. When using systemd-networkd it's
 | 
				
			||||||
  # still possible to use this option, but it's recommended to use it in conjunction
 | 
					  # still possible to use this option, but it's recommended to use it in conjunction
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue