diff --git a/configuration.nix b/configuration.nix index 0210f78..d721267 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,7 +19,7 @@ boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.configurationLimit = 10; - boot.initrd.luks.devices."luks-cb531ab6-d47e-4246-a923-55bbda22d697".device = "/dev/disk/by-uuid/cb531ab6-d47e-4246-a923-55bbda22d697"; + boot.initrd.luks.devices."luks-886090f3-1ba1-4134-9734-5b922106820d".device = "/dev/disk/by-uuid/886090f3-1ba1-4134-9734-5b922106820d"; # Clear /tmp during boot boot.tmp.cleanOnBoot = true; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 63b2222..93c382a 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -13,25 +13,24 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - #boot.kernelPackages = pkgs.linuxPackages_latest; - - boot.kernelPackages = pkgs.linuxPackages_6_14; + boot.kernelPackages = pkgs.linuxPackages_latest; + #boot.kernelPackages = pkgs.linuxPackages_6_14; fileSystems."/" = - { device = "/dev/disk/by-uuid/67519a81-c750-4cab-9e25-1f709b0b90de"; + { device = "/dev/disk/by-uuid/27986c46-1dd1-4444-b732-7e7c36f2ed29"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-900b6217-47c2-40e5-b14d-de4874ade307".device = "/dev/disk/by-uuid/900b6217-47c2-40e5-b14d-de4874ade307"; + boot.initrd.luks.devices."luks-a803c4bc-5516-4caa-b837-60735dcef39b".device = "/dev/disk/by-uuid/a803c4bc-5516-4caa-b837-60735dcef39b"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B738-2CA0"; + { device = "/dev/disk/by-uuid/62BC-E36E"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/5eec28f1-ee73-4e9f-a6ae-9234f5dbb0fd"; } + [ { device = "/dev/disk/by-uuid/ca864c9f-4435-489f-af33-2c0d5876d586"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -43,4 +42,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + hardware.enableAllFirmware = true; + } diff --git a/modules/fonts.nix b/modules/fonts.nix index c2f6e3f..a7e4383 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -25,7 +25,25 @@ dina-font proggyfonts iosevka - nerdfonts +# nerdfonts need to fix +/* + error: nerdfonts has been separated into individual font packages under the namespace nerd-fonts. + For example change: + fonts.packages = [ + ... + (pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; }) + ] + to + fonts.packages = [ + ... + pkgs.nerd-fonts._0xproto + pkgs.nerd-fonts.droid-sans-mono + ] + or for all fonts + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts) +*/ + + ]; fonts.fontDir.enable = true; diff --git a/modules/gnome.nix b/modules/gnome.nix index 72b3652..b44d7f6 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -48,7 +48,7 @@ # Set User 'elias' icon to tootbrute.png image system.activationScripts.script.text = '' mkdir -p /var/lib/AccountsService/{icons,users} - cp /home/elias/nixos-greynix/files/tootbrute.png /var/lib/AccountsService/icons/elias + cp /home/elias/nix-greynix/files/tootbrute.png /var/lib/AccountsService/icons/elias echo -e "[User]\nIcon=/var/lib/AccountsService/icons/elias\n" > /var/lib/AccountsService/users/elias chown root:root /var/lib/AccountsService/users/elias diff --git a/rebuild.sh b/rebuild.sh index 7136b0d..c81457f 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1 +1 @@ -sudo nixos-rebuild switch -I nixos-config=/home/elias/nixos-greynix/configuration.nix +sudo nixos-rebuild switch -I nixos-config=/home/elias/nix-greynix/configuration.nix diff --git a/scripts/flatpak-install.sh b/scripts/flatpak-install.sh index 464d838..fa4c36d 100755 --- a/scripts/flatpak-install.sh +++ b/scripts/flatpak-install.sh @@ -26,4 +26,6 @@ com.valvesoftware.Steam # md.obsidian.Obsidian # ) +flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + flatpak install --assumeyes $MY_FLATPAKS