diff --git a/justfile b/justfile index 1aa8b6a..91782c2 100644 --- a/justfile +++ b/justfile @@ -7,11 +7,11 @@ format_system: run0 nixfmt /etc/nixos system_update: - run0 nix flake update /etc/nixos + run0 nix flake update --flake /etc/nixos run0 nixos-rebuild boot --impure home_update: - nix flake update ~/.config/home-manager + nix flake update --flake ~/.config/home-manager rm -fr ~/.gtkrc-2.0 home-manager switch --impure diff --git a/nix/etcnixos/common.nix b/nix/etcnixos/common.nix index dff03cf..6adfc3c 100644 --- a/nix/etcnixos/common.nix +++ b/nix/etcnixos/common.nix @@ -89,19 +89,6 @@ # Set your time zone. time.timeZone = "America/New_York"; - # security = { - # #lets use doas and not sudo! - # doas.enable = true; - # sudo.enable = false; - # # Configure doas - # doas.extraRules = [ - # { - # users = [ "${username}" ]; - # keepEnv = true; - # persist = true; - # } - # ]; - # }; #lets use run0 instead! security.sudo.enable = false; diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index bbbdae8..fbcf90e 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726489388, - "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", + "lastModified": 1726650330, + "narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", + "rev": "abb448608a56a60075468e90d8acec2a7cb689b1", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726592507, - "narHash": "sha256-QvFwDEBR2EqjMAGCSeo1rCZd5VtLONnZxfYUcoWx7ZI=", + "lastModified": 1726668270, + "narHash": "sha256-+N9ASvTufNJ6VAkkvSgXMtd+0RrzjXF83AMyamQlX9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eec332b15da047813dfd28a6971ff6737ca6acd5", + "rev": "50470da36ef2c4448b23285257de4be40acd5c7c", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 1f85445..33e7134 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1726611255, + "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1726586848, - "narHash": "sha256-sW5pB0YTcvex8sjVMOffDZsOMp7rwco4MGuVrQk1HL0=", + "lastModified": 1726595793, + "narHash": "sha256-3TL/g2mCfe88ehUtoGh82HF9lKRgCpFHSIXli9yB+Sk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c62ad7457b38f4f14aa5e57e9299441976fcc662", + "rev": "318b1ef1b47bc30dddd0b14b0a8a2093039e275a", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726592507, - "narHash": "sha256-QvFwDEBR2EqjMAGCSeo1rCZd5VtLONnZxfYUcoWx7ZI=", + "lastModified": 1726669401, + "narHash": "sha256-HuyEQH0VI3m5DlCNbDafhBaOOBZTYmuTiikqr/gbNO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eec332b15da047813dfd28a6971ff6737ca6acd5", + "rev": "8f86e59bbb9ea7447f3aff57d67444cd1113e646", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1726539203, - "narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=", + "lastModified": 1726626348, + "narHash": "sha256-sYV7e1B1yLcxo8/h+/hTwzZYmaju2oObNiy5iRI0C30=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033", + "rev": "6fd52ad8bd88f39efb2c999cc971921c2fb9f3a2", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1726556131, - "narHash": "sha256-8pw8YO3TdPAc3kFivG51c3sJ4WU49G5xRVA/SxZTAdk=", + "lastModified": 1726645912, + "narHash": "sha256-2Xdji52Rc+X1iWu9t3aP9THueJ+XSBLd1mXvFZtam/A=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "c7b0aadb81cbc9ea10a650bf9f3485b94bb6e864", + "rev": "b94921efd26954a255862ae9d81146de0c64e071", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index a4c3541..83002d1 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -67,15 +67,15 @@ ... }@inputs: let - system = "x86_64-linux"; username = "primary"; homeDirectory = "/home/${username}"; hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); + pkgs = import nixpkgs { }; in { homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; + inherit pkgs; extraSpecialArgs = { inherit inputs username homeDirectory; }; diff --git a/nix/home-manager/no-gui.nix b/nix/home-manager/no-gui.nix index afa7ad5..abff0d8 100644 --- a/nix/home-manager/no-gui.nix +++ b/nix/home-manager/no-gui.nix @@ -166,6 +166,11 @@ }; }; + age.secrets.serverpass = { + file = ./secrets/server-password.age; + path = "${homeDirectory}/.secrets/serverpass"; + }; + age.secrets.gnupg = { file = ./secrets/gnupg.age; path = "${homeDirectory}/.secrets/gnupg.tar"; diff --git a/nix/home-manager/secrets/gnupg.age b/nix/home-manager/secrets/gnupg.age index 6e01960..2a50dc2 100644 Binary files a/nix/home-manager/secrets/gnupg.age and b/nix/home-manager/secrets/gnupg.age differ diff --git a/nix/home-manager/system-mreow.nix b/nix/home-manager/system-mreow.nix index 5430788..c042439 100644 --- a/nix/home-manager/system-mreow.nix +++ b/nix/home-manager/system-mreow.nix @@ -15,6 +15,8 @@ #manage bluetooth devices blueman + + niri-unstable ]; #bluetooth manager