diff --git a/flake.lock b/flake.lock index 2bb64b0..4547318 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745963817, - "narHash": "sha256-8lS2/aFUSoPXOUuvvy6Xb+bt07vsIm4twobBdjigFFI=", + "lastModified": 1746304023, + "narHash": "sha256-/CCABasYHrzz8w1OJ1dHVUMlnzpg2eeHfVal+6iEvyo=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "4013ed4dfb85afd0b73ef1c389d74aa7e6233051", + "rev": "6e4bda5ad5f7a43b90d9f22b8e86011e51569bf1", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1746193516, - "narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", + "lastModified": 1746317522, + "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", + "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", "type": "github" }, "original": { @@ -913,11 +913,11 @@ ] }, "locked": { - "lastModified": 1746040799, - "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", + "lastModified": 1746317522, + "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f217e5a319f6c186283b530f8c975e66c028433", + "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1746054057, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -1228,11 +1228,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1746194699, - "narHash": "sha256-XONo9xGd3zGt/iHmIDZ+Uj/FZxRRFmrDrIFqYtzoPnM=", + "lastModified": 1746356139, + "narHash": "sha256-Up5VXdT/G0i9dKBXlTUtgVJe4EJyIYe3gVuL7TYzr/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d66115b18ccf2fbb03da4f2ea8a41499eb8d3136", + "rev": "c9a5d4563732095cb0dd2f335210bc8a650abed6", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -1665,11 +1665,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1745416927, - "narHash": "sha256-jg725STLRgsIAgrvjbRJQEP0F0w+rmvDJ64EN65p6EI=", + "lastModified": 1746220417, + "narHash": "sha256-cN2Vf/d9KKy3V6eJIoxYHD7X0HQHfgP+lMnj3AdbsEc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ab52efd622a9f7dca269a49edbbea6b6b7294f57", + "rev": "95e2de368fe76ec0675b3d380168c5ca1c1b955d", "type": "gitlab" }, "original": { @@ -1719,11 +1719,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746158690, - "narHash": "sha256-Pe2emz36QL8GOILXvvmH/agqkspZFrcOrQxv6uufaEc=", + "lastModified": 1746331108, + "narHash": "sha256-iaBTiEmpjbIzEtGPXJguhqFyeeF50N3bu7HAusORR1c=", "owner": "danth", "repo": "stylix", - "rev": "bc38629511dd9cc78c5ca37a6e546fa66330d50e", + "rev": "b631dffa61e04b6d13ef6f1d86020e1e7df4153e", "type": "github" }, "original": { diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index e769ee2..5889b96 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,7 +1,6 @@ { pkgs, osConfig, - lib, ... }: { imports = [ @@ -13,6 +12,7 @@ ./shell/eza.nix ./shell/hyfetch.nix ]; + home = { username = "lillian"; homeDirectory = "/home/lillian"; @@ -21,6 +21,20 @@ target = ".ssh/id_ed25519.pub"; force = true; }; + + packages = with pkgs; [ + # System tools: + vscode-langservers-extracted + sops + zsh + bat + btop + broot + lazygit + navi + nil + gh + ]; }; catppuccin = { @@ -31,20 +45,6 @@ freetube.enable = true; freetube.flavor = "macchiato"; }; - - home.packages = with pkgs; [ - # System tools: - vscode-langservers-extracted - sops - zsh - bat - btop - broot - lazygit - navi - nil - gh - ]; programs = { navi.enable = true; yazi = { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ef21414..f225830 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -85,14 +85,15 @@ }; hardware.has.amd.gpu = true; }; - boot = { loader.systemd-boot.enable = false; - }; - boot.lanzaboote = { - enable = true; - pkiBundle = "/var/lib/sbctl"; + binfmt.emulatedSystems = ["aarch64-linux"]; + + lanzaboote = { + enable = true; + pkiBundle = "/var/lib/sbctl"; + }; }; users.users.lillian.extraGroups = ["gamemode"]; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 5e5bea7..7e0579a 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -67,6 +67,19 @@ ]; }; }; + + #TODO: ugly hardcoded delete, if it ever becomes a problem fix this, else just leave it I guess + system.userActivationScripts = { + removeConflictingFiles = { + text = '' + rm -f /home/lillian/.config/gtk-3.0/settings.ini + rm -f /home/lillian/.config/gtk-3.0/gtk.css + rm -f /home/lillian/.config/gtk-4.0/settings.ini + rm -f /home/lillian/.config/gtk-4.0/gtk.css + ''; + }; + }; + catppuccin = { flavor = "macchiato"; tty.enable = true;