diff --git a/flake.lock b/flake.lock index d73ef9e3..ce219fa2 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1760101617, - "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=", + "lastModified": 1761420899, + "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1826a9923881320306231b1c2090379ebf9fa4f8", + "rev": "62479232aae42c1ef09c2c027c8cfd91df060897", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762036128, - "narHash": "sha256-0VgVPYq5upSXc+LSn3ubxJhH+DLdakYW4QXeabo0Ivg=", + "lastModified": 1762205917, + "narHash": "sha256-8vFEZ4oHYOAzC9/zN3Eb/zxbfPPBGAqsQNRKG1WiqZY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "499783c86e6e9436534d1a23b35da98c7f6af3f4", + "rev": "16950d0a7a54c242201aee3ba6b7164cee6fbd88", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1762065744, - "narHash": "sha256-c04mxJoCb8f6BBrdaREWmdQq+pfp395olXhC+B0G7DI=", + "lastModified": 1762411474, + "narHash": "sha256-K/+//L44NeT25YyvpXdy01Pp5BRnJFn96KPcsIpmmAM=", "owner": "nix-community", "repo": "fenix", - "rev": "e0f24085a4a0da1c32adc308ec4c518ae886ff35", + "rev": "386504efb581a7ecd7ad4ab0ac505406ff8177bb", "type": "github" }, "original": { @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1762427122, + "narHash": "sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "24084931d8098fce300fabea9e48fa96292228d7", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1762054696, - "narHash": "sha256-4wyNPyycaPDS13OC+YPkQOrrf3ZCS/ipAh9lfo121Nw=", + "lastModified": 1762352939, + "narHash": "sha256-yYFrlLL3UCyWfZOMnoAtUzS3BB8gk2KpEnl0vHQvkfM=", "owner": "helix-editor", "repo": "helix", - "rev": "0b61e721aaae794c950c72f765388dcc5f9f32fa", + "rev": "3f4a286c8dc586d3261bfba3cb2ec3fad5c36efe", "type": "github" }, "original": { @@ -625,11 +625,11 @@ ] }, "locked": { - "lastModified": 1762087455, - "narHash": "sha256-hpbPma1eUKwLAmiVRoMgIHbHiIKFkcACobJLbDt6ABw=", + "lastModified": 1762447448, + "narHash": "sha256-BFhoqL231hyTZ7piR+8FgDJby48oWRN8+g3b1uvvtX8=", "owner": "nix-community", "repo": "home-manager", - "rev": "43e205606aeb253bfcee15fd8a4a01d8ce8384ca", + "rev": "2907788315a73d3292140b4d59b5d95796565625", "type": "github" }, "original": { @@ -667,11 +667,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762146130, + "narHash": "sha256-/XOEA0a61fZ45i/BpaSsyLNNbw/yKwjMbkB/IWSGLzU=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "b5ed4afc2277339bdf0e9edf59befff7350cf075", "type": "github" }, "original": { @@ -818,11 +818,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1761869718, - "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=", + "lastModified": 1762456696, + "narHash": "sha256-wku6qDlWKLKerJdMOCRIe0gV77lE7WO+m8z5BEqXTH0=", "owner": "hyprwm", "repo": "hyprland", - "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb", + "rev": "ca4b68e42538cb38234152ea3fc7e63363844e13", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ ] }, "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", + "lastModified": 1762208756, + "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", + "rev": "164a30b3d8b3174a32ac7326782476f1188e6118", "type": "github" }, "original": { @@ -1229,11 +1229,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1756744479, - "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "747b7912f49e2885090c83364d88cf853a020ac1", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ ] }, "locked": { - "lastModified": 1762088055, - "narHash": "sha256-zh7fDPmhmoXVTtODiDhOLlutwNLJmwOlLphVKuCCiZA=", + "lastModified": 1762307771, + "narHash": "sha256-IJWQ1NlFRATSrGa5eZdg9kQynDJOwT6WAY/P5KHAMBc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d74c3702fdc737276baccab80c2053e8cde5dba5", + "rev": "4e3340a53ea9f6b79168050a3e4b9c3944ff158e", "type": "github" }, "original": { @@ -1425,11 +1425,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1473,11 +1473,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1505,11 +1505,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1528,11 +1528,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1762093557, - "narHash": "sha256-esmyNNa8TvduITLfqYPSMroyZ9vxJr2nsvjYmHmO+Ag=", + "lastModified": 1762353527, + "narHash": "sha256-67/sO6zaf02ZPz2s6k8swg6WMExz0gls7o4jmoljwl8=", "owner": "notashelf", "repo": "nvf", - "rev": "20d8fca94dceaf943686598da7fba31b37100e50", + "rev": "3d3cd879783be1457edfb42a38f392071335edd1", "type": "github" }, "original": { @@ -1672,11 +1672,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1762016333, - "narHash": "sha256-PT8hXDYyeRjh9BGyLF/nZWm9TqRwP2EzeKuqUFH0M3w=", + "lastModified": 1762274641, + "narHash": "sha256-upzIY3p+q/NRziTmyQ0fUaKkUJrT81JruB0IxgzdQ7o=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fca718c0f2074bdccf9a996bb37b0fcaff80dc97", + "rev": "5ffe3f45ce89355dc4289e620273ea8b53ca2078", "type": "github" }, "original": { @@ -1694,11 +1694,11 @@ ] }, "locked": { - "lastModified": 1761964689, - "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", + "lastModified": 1762137611, + "narHash": "sha256-sTqb10FR/YQCuGbw16qxliX0NFlYg6evSEjN8w+9IYE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "63d22578600f70d293aede6bc737efef60ebd97f", + "rev": "3a0ebe5d2965692f990cb27e62f501ad35e3deeb", "type": "github" }, "original": { @@ -1736,11 +1736,11 @@ ] }, "locked": { - "lastModified": 1754189623, - "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1861,11 +1861,11 @@ ] }, "locked": { - "lastModified": 1761311587, - "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", "type": "github" }, "original": { @@ -1949,11 +1949,11 @@ ] }, "locked": { - "lastModified": 1760713634, - "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "753bbbdf6a052994da94062e5b753288cef28dfb", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -1969,17 +1969,17 @@ ] }, "locked": { - "lastModified": 1762074512, - "narHash": "sha256-m8ZY0rmq9QXnIR08/vOyK9MnEbiziZG8mPGAVwoYEPQ=", - "ref": "refs/heads/main", - "rev": "eb05f21bcf0f380e45537db6c5df13b50acaa4a6", - "revCount": 143, - "type": "git", - "url": "https://git.sr.ht/~canasta/zen-browser-flake" + "lastModified": 1762315617, + "narHash": "sha256-Sf81Yv2dUnEqqxIHqFxM2ZXN7n11m+2ACl3HnODWBqw=", + "owner": "youwen5", + "repo": "zen-browser-flake", + "rev": "1ebd255b39223109cc600efcb394100f4825a485", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.sr.ht/~canasta/zen-browser-flake" + "owner": "youwen5", + "repo": "zen-browser-flake", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 9436fa0d..ba8ca28c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,9 @@ { description = "cnix nix"; - outputs = inputs: - inputs.flake-parts.lib.mkFlake {inherit inputs;} { + outputs = + inputs: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" @@ -16,23 +17,25 @@ ./fmt-hooks.nix ]; - perSystem = { - config, - pkgs, - ... - }: { - devShells.default = pkgs.mkShell { - packages = [ - pkgs.git - config.packages.repl - ]; - name = "dots"; - env.DIRENV_LOG_FORMAT = ""; - shellHook = '' - ${config.pre-commit.installationScript} - ''; + perSystem = + { + config, + pkgs, + ... + }: + { + devShells.default = pkgs.mkShell { + packages = [ + pkgs.git + config.packages.repl + ]; + name = "dots"; + env.DIRENV_LOG_FORMAT = ""; + shellHook = '' + ${config.pre-commit.installationScript} + ''; + }; }; - }; }; inputs = { @@ -123,7 +126,7 @@ }; zen-browser = { - url = "git+https://git.sr.ht/~canasta/zen-browser-flake"; + url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/home/programs/ags/default.nix b/modules/home/programs/ags/default.nix index 755db9a6..5e020190 100644 --- a/modules/home/programs/ags/default.nix +++ b/modules/home/programs/ags/default.nix @@ -23,7 +23,7 @@ in # additional packages to add to gjs's runtime extraPackages = with pkgs; [ - inputs.ags.packages.${pkgs.system}.battery + inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.battery fzf io astal3 diff --git a/modules/home/programs/helix/default.nix b/modules/home/programs/helix/default.nix index f66053e9..61703d1a 100644 --- a/modules/home/programs/helix/default.nix +++ b/modules/home/programs/helix/default.nix @@ -23,7 +23,7 @@ in programs.helix = { enable = true; # package = pkgs.helix; - package = inputs.helix-flake.packages.${pkgs.system}.default; + package = inputs.helix-flake.packages.${pkgs.stdenv.hostPlatform.system}.default; settings = { theme = "gruvbox_dark_hard"; diff --git a/modules/home/programs/pkgs/default.nix b/modules/home/programs/pkgs/default.nix index 54a20cd6..b228c2be 100644 --- a/modules/home/programs/pkgs/default.nix +++ b/modules/home/programs/pkgs/default.nix @@ -33,11 +33,6 @@ in default = false; description = "Whether to install laptop-specific packages."; }; - server.enable = mkOption { - type = types.bool; - default = false; - description = "Whether to install server-specific packages."; - }; dev.enable = mkOption { type = types.bool; default = false; @@ -100,9 +95,6 @@ in (mkIf cfg.laptop.enable [ ]) - (mkIf cfg.server.enable [ - ]) - (mkIf cfg.dev.enable [ ]) ]; diff --git a/modules/home/programs/tuirun/default.nix b/modules/home/programs/tuirun/default.nix index c630f4d3..0f49d371 100644 --- a/modules/home/programs/tuirun/default.nix +++ b/modules/home/programs/tuirun/default.nix @@ -20,7 +20,7 @@ in programs.tuirun = { enable = true; config = { - plugins = with inputs.tuirun.packages.${pkgs.system}; [ + plugins = with inputs.tuirun.packages.${pkgs.stdenv.hostPlatform.system}; [ runner ]; closeOnClick = true; diff --git a/modules/home/programs/waybar/config/style.css b/modules/home/programs/waybar/config/style.css index c8c79aca..9cc83648 100644 --- a/modules/home/programs/waybar/config/style.css +++ b/modules/home/programs/waybar/config/style.css @@ -102,6 +102,7 @@ tooltip label { #clock { padding: 0px 3px; margin: 0px 6px 0px 0px; + font-size: 17px; font-family: "DepartureMono Nerd Font"; } diff --git a/modules/home/programs/wezterm/default.nix b/modules/home/programs/wezterm/default.nix index 6460bcb9..f4df0de2 100644 --- a/modules/home/programs/wezterm/default.nix +++ b/modules/home/programs/wezterm/default.nix @@ -8,7 +8,7 @@ let enable_wayland = "true"; # weztermPkg = pkgs.wezterm; - weztermFlake = inputs.wezterm.packages.${pkgs.system}.default; + weztermFlake = inputs.wezterm.packages.${pkgs.stdenv.hostPlatform.system}.default; inherit (lib) mkIf mkEnableOption; cfg = config.home.programs.wezterm; in diff --git a/modules/home/programs/zen/default.nix b/modules/home/programs/zen/default.nix index 926f30ed..91a8e214 100644 --- a/modules/home/programs/zen/default.nix +++ b/modules/home/programs/zen/default.nix @@ -15,7 +15,7 @@ in }; config = mkIf cfg.enable { home.packages = [ - inputs.zen-browser.packages.${pkgs.system}.default + inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default ]; }; } diff --git a/modules/nixos/services/agenix/default.nix b/modules/nixos/services/agenix/default.nix index 3e70707a..0ba993eb 100644 --- a/modules/nixos/services/agenix/default.nix +++ b/modules/nixos/services/agenix/default.nix @@ -5,16 +5,17 @@ pkgs, self, ... -}: let - inherit - (lib) +}: +let + inherit (lib) mkIf mkEnableOption mkOption mkMerge ; cfg = config.nixos.services.agenix; -in { +in +{ options = { nixos.services.agenix = { enable = mkEnableOption "Enables agenix system environment"; @@ -90,7 +91,7 @@ in { environment = { systemPackages = [ - inputs.agenix.packages.${pkgs.system}.default + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.default pkgs.age ]; }; diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 43c78ea8..ad9d7eaf 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -23,7 +23,7 @@ in config = mkIf cfg.enable { fonts = { packages = with pkgs; [ - inputs.fonts.packages.${pkgs.system}.vcr-mono + inputs.fonts.packages.${pkgs.stdenv.hostPlatform.system}.vcr-mono noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji