diff --git a/flake.lock b/flake.lock index dbaa17d..03bde78 100644 --- a/flake.lock +++ b/flake.lock @@ -251,6 +251,32 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1786106723, + "narHash": "sha256-CgKDSHL6rqAAQkkvg1xaZDQXb77+4XW73iGcUMJ+2w0=", + "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1049422.f13ff45afd1b/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1786384358, + "narHash": "sha256-OETwiymkMwunF+pfL25DzLMF2/YpMcJUjVd9qZ0YdsM=", + "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1051473.2fcb964de67f/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1786106723, "narHash": "sha256-CgKDSHL6rqAAQkkvg1xaZDQXb77+4XW73iGcUMJ+2w0=", @@ -265,9 +291,7 @@ }, "noctalia": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1786566000, @@ -285,9 +309,7 @@ }, "noctalia-greeter": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1786468029, @@ -357,7 +379,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "systems": "systems" }, "locked": { diff --git a/flake.nix b/flake.nix index 55d7e72..7524df4 100644 --- a/flake.nix +++ b/flake.nix @@ -18,16 +18,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - noctalia = { - url = "github:noctalia-dev/noctalia"; - inputs.nixpkgs.follows = "nixpkgs"; - - }; + noctalia.url = "github:noctalia-dev/noctalia"; - noctalia-greeter = { - url = "github:noctalia-dev/noctalia-greeter"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + noctalia-greeter.url = "github:noctalia-dev/noctalia-greeter"; zen-browser = { url = "github:youwen5/zen-browser-flake"; @@ -67,6 +60,15 @@ ]; in { + + nixConfig = { + extra-substituters = [ "https://noctalia.cachix.org" ]; + extra-trusted-public-keys = [ + "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" + ]; + }; + + # `sudo nixos-rebuild switch --flake .#Khaos` nixosConfigurations = { Khaos = nixpkgs.lib.nixosSystem { diff --git a/hosts/Styx/configuration.nix b/hosts/Styx/configuration.nix index edeb0f3..5afc547 100644 --- a/hosts/Styx/configuration.nix +++ b/hosts/Styx/configuration.nix @@ -39,7 +39,7 @@ programs.niri = { enable = true; - package = inputs.niri.packages.${pkgs.system}.niri-unstable; + package = inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable; }; programs.hyprland.enable = true; @@ -197,7 +197,15 @@ }; - nix.settings.experimental-features = "nix-command flakes"; + nix.settings = { + experimental-features = "nix-command flakes"; + + # # noctalia binary cache: https://docs.noctalia.dev/noctalia/getting-started/nixos/#binary-cache + # extra-substituters = [ "https://noctalia.cachix.org" ]; + # extra-trusted-public-keys = [ + # "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" + # ]; + }; users.defaultUserShell = pkgs.fish; @@ -218,6 +226,13 @@ keyboard = { layout = "us"; }; + appearance = { + scheme = "Synced"; + password_style = "random"; + hide_logo = true; + theme_mode = "dark"; + font_family = "TX-02"; + }; }; }; diff --git a/modules/home/apps/spicetify.nix b/modules/home/apps/spicetify.nix index 5e04548..610da34 100644 --- a/modules/home/apps/spicetify.nix +++ b/modules/home/apps/spicetify.nix @@ -8,7 +8,7 @@ with lib; let cfg = config.nyx.spicetify; - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { diff --git a/modules/home/tools/default.nix b/modules/home/tools/default.nix index 18b8232..4d7ffb9 100644 --- a/modules/home/tools/default.nix +++ b/modules/home/tools/default.nix @@ -7,7 +7,6 @@ imports = [ ./helix ./zellij - ./zk ./zed ./jujutsu ./filaments diff --git a/modules/home/tools/filaments/default.nix b/modules/home/tools/filaments/default.nix index 70e7c65..a010cfe 100644 --- a/modules/home/tools/filaments/default.nix +++ b/modules/home/tools/filaments/default.nix @@ -11,6 +11,6 @@ home.packages = [ - filaments.packages.${pkgs.system}.default + filaments.packages.${pkgs.stdenv.hostPlatform.system}.default ]; } diff --git a/users/suri/common.nix b/users/suri/common.nix index 3928af3..eaf5e91 100644 --- a/users/suri/common.nix +++ b/users/suri/common.nix @@ -10,10 +10,8 @@ nyx.fish.enable = true; nyx.zellij.enable = true; nyx.helix.enable = true; - nyx.zk.enable = true; nyx.jujutsu.enable = true; - programs.direnv = { enable = true; enableZshIntegration = true;