diff --git a/flake.lock b/flake.lock index d55da37..f280d29 100644 --- a/flake.lock +++ b/flake.lock @@ -242,7 +242,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1609520816, @@ -259,16 +259,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -289,22 +289,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1696125185, @@ -316,7 +300,7 @@ }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs", "repo": "nixpkgs", "type": "github" } @@ -370,6 +354,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1694760568, "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", @@ -380,12 +380,12 @@ }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1602702596, "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", @@ -400,7 +400,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1692447944, "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", @@ -424,7 +424,7 @@ "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs_6", "sops-nix": "sops-nix", "ssbm": "ssbm" } @@ -472,7 +472,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -492,7 +492,7 @@ "ssbm": { "inputs": { "nix": "nix", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "slippi-desktop": "slippi-desktop" }, "locked": { diff --git a/flake.nix b/flake.nix index dd0f6aa..9a2d120 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/master"; helix.url = "github:helix-editor/helix/75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b"; disko.url = "github:nix-community/disko/master"; @@ -20,7 +20,7 @@ outputs = { self, - nixpkgs-unstable, + nixpkgs, home-manager, ... } @ inputs: let @@ -34,7 +34,7 @@ "x86_64-darwin" ]; - forAllSystems = nixpkgs-unstable.lib.genAttrs systems; + forAllSystems = nixpkgs.lib.genAttrs systems; color-schemes = (import ./lib/colors.nix inputs).schemes; colors = color-schemes.catppuccin-mocha-sapphire; @@ -49,11 +49,11 @@ # Your custom packages # Acessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs-unstable.legacyPackages.${system}); + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); # Formatter for your nix files, available through 'nix fmt' # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs-unstable.legacyPackages.${system}.alejandra); + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; @@ -69,8 +69,8 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = let - mkNixosSystem = cb: system: modules: homeManagerModules: - cb { + mkNixosSystem = system: modules: homeManagerModules: + nixpkgs.lib.nixosSystem { system = system; specialArgs = { inherit inputs outputs system colors font; @@ -94,29 +94,27 @@ } ]; }; - # mkNixosStableSystem = mkNixosSystem nixpkgs-stable.lib.nixosSystem; - mkNixosUnstableSystem = mkNixosSystem nixpkgs-unstable.lib.nixosSystem; in { - dragon = mkNixosUnstableSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [ + dragon = mkNixosSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [ dragon ]); - thinker = mkNixosUnstableSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [ + thinker = mkNixosSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [ thinker ]); - foxtrot = mkNixosUnstableSystem "x86_64-linux" [./nixos/foxtrot] (with outputs.homeManagerModules; [ + foxtrot = mkNixosSystem "x86_64-linux" [./nixos/foxtrot] (with outputs.homeManagerModules; [ foxtrot ]); beefcake = - mkNixosUnstableSystem "x86_64-linux" [ + mkNixosSystem "x86_64-linux" [ inputs.api-lyte-dev.nixosModules.x86_64-linux.api-lyte-dev ./nixos/beefcake ] (with outputs.homeManagerModules; [ linux ]); - rascal = mkNixosUnstableSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [ + rascal = mkNixosSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [ linux ]); - musicbox = mkNixosUnstableSystem "x86_64-linux" [./nixos/musicbox] (with outputs.homeManagerModules; [ + musicbox = mkNixosSystem "x86_64-linux" [./nixos/musicbox] (with outputs.homeManagerModules; [ sway ]); }; @@ -129,7 +127,7 @@ system = "x86_64-linux"; in home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs-unstable.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = {inherit inputs outputs system colors font;}; modules = with outputs.homeManagerModules; [linux]; }; @@ -137,7 +135,7 @@ system = "aarch64-darwin"; in home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs-unstable.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = {inherit inputs outputs system colors font;}; modules = with outputs.homeManagerModules; [macos]; }; diff --git a/lib/colors.nix b/lib/colors.nix index da72f1b..2a3c1d4 100644 --- a/lib/colors.nix +++ b/lib/colors.nix @@ -1,4 +1,4 @@ -{nixpkgs-unstable, ...}: { +{nixpkgs, ...}: { schemes = let mkColorScheme = scheme @ { scheme-name, @@ -51,7 +51,7 @@ // scheme; in { - withHashPrefix = nixpkgs-unstable.lib.mapAttrs (_: value: "#${value}") base; + withHashPrefix = nixpkgs.lib.mapAttrs (_: value: "#${value}") base; } // base; in { diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index e3d4c93..a086ec5 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -72,7 +72,7 @@ programs.eza = { enable = true; - package = inputs.nixpkgs-unstable.legacyPackages.${system}.eza; + package = inputs.nixpkgs.legacyPackages.${system}.eza; }; programs.skim = { diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 870d404..f9c15bb 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -77,6 +77,8 @@ ]); }; + users.groups.daniel = {}; + users.users = { daniel = { isNormalUser = true; @@ -194,7 +196,7 @@ id = "nixpkgs"; type = "indirect"; }; - flake = inputs.nixpkgs-unstable; + flake = inputs.nixpkgs; }; }; }; diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix index 13b86f1..ebc0793 100644 --- a/modules/nixos/desktop-usage.nix +++ b/modules/nixos/desktop-usage.nix @@ -1,6 +1,7 @@ { pkgs, inputs, + outputs, system, ... }: { @@ -12,12 +13,14 @@ ./user-installed-applications.nix ]; + nixpkgs.overlays = [outputs.overlays.modifications]; + # fonts.packages if unstable? fonts.packages = with pkgs; [ (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) ] - ++ (with inputs.nixpkgs-unstable.legacyPackages.${system}; [ + ++ (with inputs.nixpkgs.legacyPackages.${system}; [ (iosevka.override { set = "lyteterm"; privateBuildPlan = '' @@ -114,7 +117,8 @@ two = 'curly-neck' three = 'two-arcs' four = 'semi-open-non-crossing' - five = 'vertical-upper-left-bar' + # five = 'vertical-upper-left-bar' + five = 'upright-flat' six = 'straight-bar' seven = 'curly-serifed-crossbar' eight = 'two-circles' diff --git a/overlays/default.nix b/overlays/default.nix index 23f8d20..ad60137 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,12 +6,6 @@ # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { - final = { - linux_6_5 = { - patches = []; - kernelPatches = []; - }; - }; linux_6_5 = prev.linux_6_5.override { patches = []; kernelPatches = []; @@ -21,7 +15,7 @@ # When applied, the unstable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.unstable' unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { + unstable = import inputs.nixpkgs { system = final.system; config.allowUnfree = true; };