diff --git a/.github/README.md b/.github/README.md index 4ed6380cc..97aa6ac81 100644 --- a/.github/README.md +++ b/.github/README.md @@ -17,7 +17,6 @@ - [hydra](../hosts/hydra/) A super mid spec latop - [amatarasu](../hosts/amatarasu/) My high end gameing machine - :electric_plug: [modules](../modules/) -- :lock: [secrets](secrets)
Hyprland Shortcuts diff --git a/env.nix b/env.nix index d3cf667a0..d1ab5f199 100755 --- a/env.nix +++ b/env.nix @@ -1,3 +1,3 @@ { - env = "eyJhIjoiNjA0YTQxZmY1ZDI1NzQ5MzllZmJiMWM1NWJhYzA5MGUiLCJ0IjoiN2U5MzZlMjAtODE4ZS00N2UwLWE2ZjEtYmIxOTE3NmY0ZTE4IiwicyI6IllUSXdZelJqTm1RdE5qY3lNeTAwWmpNMExUbGpOell0TmpKall6RmxPVEpsTWpkaiJ9"; + env = "#"; } diff --git a/flake.lock b/flake.lock index 81b7f606c..dc993f7aa 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1687898128, - "narHash": "sha256-eO8OZz4hyx8pSezy0bCFP0DYqrNrihBFE08lkHOVTrs=", + "lastModified": 1688215289, + "narHash": "sha256-O6CoZD4Oml6sypdaSBh9Q+ZwQw2VBDJ93FUE+0IH/nI=", "owner": "isabelroses", "repo": "nur", - "rev": "a078c496da026b8aacf09d8bb8d895c913d06806", + "rev": "de0d137153724437e2a97784bf3d7949cc18c436", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1680531544, - "narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=", + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", "owner": "nix-community", "repo": "flake-compat", - "rev": "95e78dc12268c5e4878621845c511077f3798729", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", "type": "github" }, "original": { @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1687762428, + "narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "37dd7bb15791c86d55c5121740a1887ab55ee836", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1687856573, - "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=", + "lastModified": 1688168945, + "narHash": "sha256-AfBdMc2JU54YKaOAvCR0t3dWQIA1bLKb9vGnaZJUh0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13", + "rev": "44d1a8542ac92f0ce75d970090216245043a2709", "type": "github" }, "original": { @@ -307,11 +307,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1687865038, - "narHash": "sha256-zFTxFNXmXc2XOriWtNzuznEICcSBnIbRVVR/M5w/Y40=", + "lastModified": 1688117346, + "narHash": "sha256-ouQ7g5zPv7miut14uFmFrcLNaXaknqpXxQjGNjTZqu8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d83296c7a9029eccc04544ddf0a8387d8104b882", + "rev": "e96fcb31f0df36a88922fa1870e3372218c79539", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1687744035, - "narHash": "sha256-Tv3e/SBh32HWC/5jJCtfS4yFNBn2XzjKDVxRmfZgetM=", + "lastModified": 1688002352, + "narHash": "sha256-jp6MOYWPsLbnDrk3ZWV98c6Z/PolEkfcuHXtAeKu66A=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "a74d3c57242f34a767d920b4b31820047c59ff92", + "rev": "db318eee754563269536c5e3513abbb9b130481a", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1687828977, - "narHash": "sha256-10ZbiOZsDbfv/WehdIi8HPyi0B1RIZKvl9ksHTfELp0=", + "lastModified": 1688087955, + "narHash": "sha256-nABHI/8QTrnJreqNoqg7iqKgWNJ2lcW5huufhbDlCRg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "441a5d7e6a3de3ed126f56975df6f5c072567c97", + "rev": "3cc15269b7133a52f6a34b7f03d4c4d7c50ce660", "type": "github" }, "original": { @@ -619,11 +619,11 @@ ] }, "locked": { - "lastModified": 1687897098, - "narHash": "sha256-E2g7T5R2ZA5VV/R2pLUeOO2gs5iY3E3mDgBJJLhet6U=", + "lastModified": 1688214671, + "narHash": "sha256-zXeYnLFAzPXoDoQXGITz7gm928wMu+tK7X/7HvRIi3g=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "cbaa46c8609f1d16d0b28e33ebe3826aeb454ea6", + "rev": "eefa91d1ff0e7337b78096434ef2066157fc425d", "type": "github" }, "original": { @@ -649,11 +649,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1687807295, - "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", "type": "github" }, "original": { @@ -665,11 +665,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1687740418, - "narHash": "sha256-hZ51wbEaMFEo5MAOR9o+h7LNVxMIOCYABT5OwFesfCU=", + "lastModified": 1688001024, + "narHash": "sha256-Zf88j+DUj6rDgveWfdEyUo4fL1KZTowzPAN6gpeqzKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4137dbc2737384c4cc9e2b5d3c4cfc6ba6e5f0cc", + "rev": "2c8591ad6a6f9d679817a94f847c59b0d1e3289e", "type": "github" }, "original": { @@ -682,11 +682,11 @@ "nu_scripts": { "flake": false, "locked": { - "lastModified": 1687693193, - "narHash": "sha256-HAsJHUjZcjzfqpBcDcXpX2hCPDvMkPgAPuslVJwlex0=", + "lastModified": 1688200816, + "narHash": "sha256-YGl+w3VjARdB7uvKJ+5BHbap7jW6VjECB9o/aYN+g9w=", "ref": "refs/heads/main", - "rev": "a2f82bd987e5f3f1a118281b290a753306acf4a1", - "revCount": 691, + "rev": "a61256da0ee77a29b478877b47eea88f522a6c11", + "revCount": 695, "submodules": true, "type": "git", "url": "https://github.com/nushell/nu_scripts" @@ -699,11 +699,11 @@ }, "nur": { "locked": { - "lastModified": 1687899931, - "narHash": "sha256-jtpA4wL+lZdxaxqNwHYm7bBOjuBbg9pOyu5ickZhi08=", + "lastModified": 1688215379, + "narHash": "sha256-RD3I0qSsDmHhyDLVBJKerf/1du7mHrrgiLCVyZ5F1lk=", "owner": "nix-community", "repo": "nur", - "rev": "a8db99b305614449e80ba3eb4237d8b7d6e583b1", + "rev": "4e21688950ea2ae1697e1084b66f8a3805e6373f", "type": "github" }, "original": { @@ -772,11 +772,11 @@ ] }, "locked": { - "lastModified": 1687833260, - "narHash": "sha256-1AC7fV+u2C6uGn+t36W6XuE3Bfg/ZXMkr/yPogdtnVg=", + "lastModified": 1688178944, + "narHash": "sha256-4fef6jlv73WW6FLXssEa88WaTVEU268ipI6fatg9vRE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8af5d21ba69012d1cafaea3da40ac902e744a369", + "rev": "ef95001485c25edb43ea236bdb03640b9073abef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index de6a2a1c3..f24f44bc0 100755 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake-parts, ... } @ inputs: - flake-parts.lib.mkFlake {inherit inputs;} { + flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: { systems = [ "x86_64-linux" ]; @@ -16,6 +16,8 @@ {config._module.args._inputs = inputs // {inherit (inputs) self;};} inputs.flake-parts.flakeModules.easyOverlay + + ./lib/args.nix # args that is passsed to the flake, moved away from the main file ]; flake = let @@ -23,37 +25,22 @@ lib = import ./lib {inherit nixpkgs lib inputs;}; in { # entry-point for nixos configurations - nixosConfigurations = import ./hosts {inherit nixpkgs self lib;}; + nixosConfigurations = import ./hosts {inherit nixpkgs self lib withSystem;}; }; perSystem = { config, - inputs', + #inputs', pkgs, - system, + #system, ... }: { - imports = [ - { - _module.args.pkgs = import nixpkgs { - config.allowUnfree = true; - config.allowUnsupportedSystem = true; - inherit system; - }; - } - ]; + imports = [{_module.args.pkgs = config.legacyPackages;}]; # provide the formatter for nix fmt formatter = pkgs.alejandra; - - # packages - packages = { - # A copy of Hyprland with its nixpkgs overriden - # cannot trigger binary cache pulls, so I push it to my own - hyprland-cached = inputs'.hyprland.packages.default; - }; }; - }; + }); inputs = { flake-parts = { diff --git a/home/default.nix b/home/default.nix index 39435a843..18f1c7650 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,7 +2,8 @@ config, inputs, self, - profiles, + inputs', + self', ... }: let user = @@ -14,7 +15,7 @@ in { useUserPackages = true; useGlobalPkgs = true; extraSpecialArgs = { - inherit inputs self profiles; + inherit inputs self inputs' self'; }; users = { # home directory for the user diff --git a/home/isabel/default.nix b/home/isabel/default.nix index 0930967c6..3d482c0a9 100644 --- a/home/isabel/default.nix +++ b/home/isabel/default.nix @@ -1,6 +1,5 @@ { inputs, - pkgs, config, lib, ... diff --git a/home/isabel/packages/cli/confs/bat.nix b/home/isabel/packages/cli/confs/bat.nix index adab72e19..4c18fab7c 100644 --- a/home/isabel/packages/cli/confs/bat.nix +++ b/home/isabel/packages/cli/confs/bat.nix @@ -1,9 +1,6 @@ { osConfig, lib, - pkgs, - inputs, - self, ... }: with lib; let diff --git a/home/isabel/packages/cli/confs/btop.nix b/home/isabel/packages/cli/confs/btop.nix index b5b02a71e..95dde838a 100644 --- a/home/isabel/packages/cli/confs/btop.nix +++ b/home/isabel/packages/cli/confs/btop.nix @@ -1,9 +1,6 @@ { osConfig, lib, - pkgs, - inputs, - self, ... }: with lib; let @@ -13,8 +10,6 @@ with lib; let acceptedTypes = ["desktop" "laptop" "lite" "hybrid"]; in { config = mkIf ((builtins.elem device.type acceptedTypes) && (programs.cli.enable)) { - home.packages = [pkgs.btop]; - programs.btop = { enable = true; catppuccin.enable = true; diff --git a/home/isabel/packages/cli/confs/fish.nix b/home/isabel/packages/cli/confs/fish.nix index 63a1be90e..6ede422b2 100644 --- a/home/isabel/packages/cli/confs/fish.nix +++ b/home/isabel/packages/cli/confs/fish.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +_: { programs.fish = { enable = true; catppuccin.enable = true; diff --git a/home/isabel/packages/cli/confs/git.nix b/home/isabel/packages/cli/confs/git.nix index e7bed9eb3..7dcb4dd47 100644 --- a/home/isabel/packages/cli/confs/git.nix +++ b/home/isabel/packages/cli/confs/git.nix @@ -14,7 +14,6 @@ with lib; let in { config = mkIf ((builtins.elem device.type acceptedTypes) && (programs.cli.enable)) { home.packages = with pkgs; [ - gh-cal # github activity stats in the CLI gist # manage github gists act # local github actions gitflow @@ -25,7 +24,11 @@ in { gh = { enable = true; enableGitCredentialHelper = false; - extensions = []; + extensions = with pkgs; [ + gh-cal # github activity stats in the CLI + gh-dash # dashboard with pull requests and issues + gh-eco # explore the ecosystem + ]; settings = { git_protocol = "ssh"; prompt = "enabled"; diff --git a/home/isabel/packages/cli/confs/nix-shell.nix b/home/isabel/packages/cli/confs/nix-shell.nix index 2688fe1d1..33d7ee662 100644 --- a/home/isabel/packages/cli/confs/nix-shell.nix +++ b/home/isabel/packages/cli/confs/nix-shell.nix @@ -2,8 +2,6 @@ osConfig, lib, pkgs, - inputs, - self, ... }: with lib; let @@ -18,6 +16,7 @@ in { alejandra deadnix nix-index + nix-tree statix ]; diff --git a/home/isabel/packages/cli/confs/starship.nix b/home/isabel/packages/cli/confs/starship.nix index fc5b3ab00..980ba5173 100644 --- a/home/isabel/packages/cli/confs/starship.nix +++ b/home/isabel/packages/cli/confs/starship.nix @@ -1,9 +1,6 @@ { osConfig, lib, - pkgs, - inputs, - self, ... }: with lib; let @@ -13,7 +10,6 @@ with lib; let acceptedTypes = ["desktop" "laptop" "lite" "hybrid"]; in { config = mkIf ((builtins.elem device.type acceptedTypes) && (programs.cli.enable)) { - home.packages = [pkgs.starship]; programs.starship = { enable = true; catppuccin.enable = true; diff --git a/home/isabel/packages/cli/shared.nix b/home/isabel/packages/cli/shared.nix index 309009eba..a1a63876e 100644 --- a/home/isabel/packages/cli/shared.nix +++ b/home/isabel/packages/cli/shared.nix @@ -2,8 +2,6 @@ osConfig, lib, pkgs, - inputs, - self, ... }: with lib; let diff --git a/home/isabel/packages/gui/confs/chromium.nix b/home/isabel/packages/gui/confs/chromium.nix index 7df2989d8..27a47b521 100644 --- a/home/isabel/packages/gui/confs/chromium.nix +++ b/home/isabel/packages/gui/confs/chromium.nix @@ -1,12 +1,10 @@ { lib, - pkgs, osConfig, ... }: with lib; let device = osConfig.modules.device; - env = osConfig.modules.usrEnv; acceptedTypes = ["desktop" "laptop" "hybrid"]; in { config = mkIf (builtins.elem device.type acceptedTypes) { diff --git a/home/isabel/packages/gui/confs/editors/nvim/default.nix b/home/isabel/packages/gui/confs/editors/nvim/default.nix index 8ff3f2533..f63f2d3a4 100644 --- a/home/isabel/packages/gui/confs/editors/nvim/default.nix +++ b/home/isabel/packages/gui/confs/editors/nvim/default.nix @@ -2,7 +2,6 @@ pkgs, lib, osConfig, - inputs, ... }: with lib; let diff --git a/home/isabel/packages/gui/confs/eww/default.nix b/home/isabel/packages/gui/confs/eww/default.nix index 8ac2842b4..3105745b7 100644 --- a/home/isabel/packages/gui/confs/eww/default.nix +++ b/home/isabel/packages/gui/confs/eww/default.nix @@ -3,7 +3,6 @@ lib, pkgs, osConfig, - self, ... }: with lib; let @@ -15,11 +14,6 @@ with lib; let device = osConfig.modules.device; env = osConfig.modules.usrEnv; acceptedTypes = ["desktop" "laptop" "hybrid"]; - mkService = lib.recursiveUpdate { - Unit.PartOf = ["graphical-session.target"]; - Unit.After = ["graphical-session.target"]; - Install.WantedBy = ["graphical-session.target"]; - }; in { config = mkIf (builtins.elem device.type acceptedTypes) { home.packages = with pkgs; [ diff --git a/home/isabel/packages/gui/confs/launchers/rofi.nix b/home/isabel/packages/gui/confs/launchers/rofi.nix index ae93f1131..781e9fc60 100644 --- a/home/isabel/packages/gui/confs/launchers/rofi.nix +++ b/home/isabel/packages/gui/confs/launchers/rofi.nix @@ -3,16 +3,14 @@ lib, pkgs, osConfig, - self, ... }: with lib; let device = osConfig.modules.device; - env = osConfig.modules.usrEnv; acceptedTypes = ["laptop" "desktop" "hybrid" "lite"]; rofiPackage = - if env.isWayland + if osConfig.modules.usrEnv.isWayland then pkgs.rofi-wayland else pkgs.rofi; in { diff --git a/home/isabel/packages/gui/confs/terminals/alacritty/default.nix b/home/isabel/packages/gui/confs/terminals/alacritty/default.nix index d193247c4..2d5126eaf 100644 --- a/home/isabel/packages/gui/confs/terminals/alacritty/default.nix +++ b/home/isabel/packages/gui/confs/terminals/alacritty/default.nix @@ -1,10 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { - home.packages = with pkgs; [alacritty]; +_: { programs.alacritty = { enable = true; catppuccin.enable = true; diff --git a/home/isabel/packages/gui/confs/terminals/kitty/default.nix b/home/isabel/packages/gui/confs/terminals/kitty/default.nix index c018ad566..840efb7c6 100644 --- a/home/isabel/packages/gui/confs/terminals/kitty/default.nix +++ b/home/isabel/packages/gui/confs/terminals/kitty/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, osConfig, ... }: diff --git a/home/isabel/packages/gui/shared.nix b/home/isabel/packages/gui/shared.nix index 453c557cc..275c18125 100644 --- a/home/isabel/packages/gui/shared.nix +++ b/home/isabel/packages/gui/shared.nix @@ -14,7 +14,7 @@ in { home.packages = with pkgs; [ bitwarden obsidian - zoom-us # I hate this + #zoom-us # I hate this xfce.thunar pamixer # move jellyfin-media-player diff --git a/home/isabel/packages/gui/wayland.nix b/home/isabel/packages/gui/wayland.nix index 65d24b1f9..3a54232f0 100644 --- a/home/isabel/packages/gui/wayland.nix +++ b/home/isabel/packages/gui/wayland.nix @@ -10,7 +10,7 @@ in { config = mkIf (env.isWayland) { home.packages = with pkgs; [ swappy - swaynotificationcenter + #swaynotificationcenter ]; }; } diff --git a/home/isabel/packages/system/gpg.nix b/home/isabel/packages/system/gpg.nix index b7b839d4c..e0571ec5a 100644 --- a/home/isabel/packages/system/gpg.nix +++ b/home/isabel/packages/system/gpg.nix @@ -1,11 +1,8 @@ { - osConfig, config, lib, ... -}: let - sys = osConfig.modules.system; -in { +}: { services = { gpg-agent = { enable = true; diff --git a/home/isabel/packages/wm/hyprland/config.nix b/home/isabel/packages/wm/hyprland/config.nix index 02df23e95..7dc957382 100644 --- a/home/isabel/packages/wm/hyprland/config.nix +++ b/home/isabel/packages/wm/hyprland/config.nix @@ -1,8 +1,6 @@ { config, - pkgs, osConfig, - lib, ... }: let pointer = config.home.pointerCursor; @@ -32,7 +30,6 @@ in { exec-once = ~/.config/eww/scripts/init exec-once = hyprctl setcursor ${pointer.name} ${toString pointer.size} - # █▀▄▀█ █▀█ █▄░█ █ ▀█▀ █▀█ █▀█ # █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄ ${builtins.concatStringsSep "\n" (builtins.map (monitor: ''monitor=${monitor},preferred,0x0,1'') monitors)} @@ -99,13 +96,13 @@ in { blur_size = 2 blur_new_optimizations = true blurls = "eww_powermenu" - blurls = "eww_takeshot" + blurls = "eww_takeshot" # █▀ █░█ ▄▀█ █▀▄ █▀█ █░█░█ # ▄█ █▀█ █▀█ █▄▀ █▄█ ▀▄▀▄▀ drop_shadow = true - col.shadow=$surface1 - col.shadow_inactive=$surface1 + col.shadow=$surface1 + col.shadow_inactive=$surface1 } # ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█ diff --git a/home/isabel/packages/wm/hyprland/default.nix b/home/isabel/packages/wm/hyprland/default.nix index ce46d6e85..3af36c156 100644 --- a/home/isabel/packages/wm/hyprland/default.nix +++ b/home/isabel/packages/wm/hyprland/default.nix @@ -1,15 +1,13 @@ { pkgs, lib, - config, - inputs, - self, osConfig, + inputs', ... }: with lib; let - hyprpicker = inputs.hyprpicker.packages.${pkgs.system}.default; - hyprland-share-picker = inputs.xdg-portal-hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + hyprpicker = inputs'.hyprpicker.packages.default; + hyprland-share-picker = inputs'.xdg-portal-hyprland.packages.xdg-desktop-portal-hyprland; env = osConfig.modules.usrEnv; device = osConfig.modules.device; @@ -26,7 +24,7 @@ in { wayland.windowManager.hyprland = { enable = true; systemdIntegration = true; - package = inputs.hyprland.packages.${pkgs.system}.default.override { + package = inputs'.hyprland.packages.default.override { nvidiaPatches = (device.gpu == "nvidia") || (device.gpu == "hybrid-nv"); }; }; diff --git a/home/isabel/services/wayland/clipboard/default.nix b/home/isabel/services/wayland/clipboard/default.nix index 54d239fb7..194c9952b 100644 --- a/home/isabel/services/wayland/clipboard/default.nix +++ b/home/isabel/services/wayland/clipboard/default.nix @@ -1,8 +1,7 @@ { - pkgs, lib, + pkgs, osConfig, - self, ... }: with lib; let diff --git a/home/isabel/themes/qt.nix b/home/isabel/themes/qt.nix index cb25dcc47..1b36af9dc 100644 --- a/home/isabel/themes/qt.nix +++ b/home/isabel/themes/qt.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: { +{pkgs, ...}: { xdg.configFile."kdeglobals".source = "${(pkgs.catppuccin-kde.override { flavour = ["mocha"]; accents = ["sapphire"]; diff --git a/hosts/amatarasu/default.nix b/hosts/amatarasu/default.nix index f32362976..c890e5a63 100755 --- a/hosts/amatarasu/default.nix +++ b/hosts/amatarasu/default.nix @@ -1,9 +1,4 @@ -{ - inputs, - pkgs, - config, - ... -}: { +_: { imports = [ ./settings.nix ./hardware-configuration.nix diff --git a/hosts/amatarasu/hardware-configuration.nix b/hosts/amatarasu/hardware-configuration.nix index 0168b90e1..4e8613ff6 100644 --- a/hosts/amatarasu/hardware-configuration.nix +++ b/hosts/amatarasu/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/hosts/amatarasu/settings.nix b/hosts/amatarasu/settings.nix index 9e83a579d..478266092 100644 --- a/hosts/amatarasu/settings.nix +++ b/hosts/amatarasu/settings.nix @@ -1,8 +1,6 @@ { config, lib, - inputs, - self, ... }: with lib; let diff --git a/hosts/default.nix b/hosts/default.nix index 21218edde..bcdd384d4 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,6 +1,7 @@ { self, lib, + withSystem, ... }: let inputs = self.inputs; @@ -39,6 +40,7 @@ in { # fuck nvidia - Linus "the linux" Torvalds amatarasu = lib.mkNixosSystem { + inherit withSystem; system = "x86_64-linux"; modules = [ @@ -48,11 +50,11 @@ in { virtualization ] ++ lib.concatLists [shared homes]; - # specialArgs = {inherit inputs self lib profiles;}; specialArgs = sharedArgs; }; - hydra = lib.mkSystem { + hydra = lib.mkNixosSystem { + inherit withSystem; system = "x86_64-linux"; modules = [ @@ -62,6 +64,6 @@ in { virtualization ] ++ lib.concatLists [shared homes]; - specialArgs = {inherit inputs self lib;}; + specialArgs = sharedArgs; }; } diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix index 02a493b0a..36e8096ed 100755 --- a/hosts/hydra/default.nix +++ b/hosts/hydra/default.nix @@ -1,9 +1,4 @@ -{ - inputs, - pkgs, - config, - ... -}: { +_: { imports = [ ./settings.nix ./hardware-configuration.nix diff --git a/hosts/hydra/hardware-configuration.nix b/hosts/hydra/hardware-configuration.nix index 29a4ee0fc..f296f1dbd 100755 --- a/hosts/hydra/hardware-configuration.nix +++ b/hosts/hydra/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/hosts/hydra/services.nix b/hosts/hydra/services.nix index 1f62fb0ea..10142d88d 100755 --- a/hosts/hydra/services.nix +++ b/hosts/hydra/services.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: let +{pkgs, ...}: let cloud = import ../../env.nix; in { #systemd diff --git a/hosts/hydra/settings.nix b/hosts/hydra/settings.nix index 97bb29933..163e4ddb0 100644 --- a/hosts/hydra/settings.nix +++ b/hosts/hydra/settings.nix @@ -1,8 +1,6 @@ { config, lib, - inputs, - self, ... }: with lib; let diff --git a/lib/args.nix b/lib/args.nix new file mode 100644 index 000000000..ad103f4c6 --- /dev/null +++ b/lib/args.nix @@ -0,0 +1,12 @@ +{inputs, ...}: let + inherit (inputs.nixpkgs); +in { + perSystem = {system, ...}: { + legacyPackages = import inputs.nixpkgs { + inherit system; + config.allowUnfree = true; + config.allowUnsupportedSystem = true; + overlays = []; + }; + }; +} diff --git a/lib/default.nix b/lib/default.nix index a658ea782..4e8e78885 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -44,11 +44,17 @@ in mkNixosSystem = { modules, system, + withSystem, ... } @ args: - mkSystem { - inherit modules system; - specialArgs = {inherit inputs lib self;} // args.specialArgs or {}; - }; + withSystem system ({ + inputs', + self', + ... + }: + mkSystem { + inherit modules system; + specialArgs = {inherit inputs lib self inputs' self';} // args.specialArgs or {}; + }); } ) diff --git a/modules/common/core/network/default.nix b/modules/common/core/network/default.nix index 78bf63c91..d6dce2136 100644 --- a/modules/common/core/network/default.nix +++ b/modules/common/core/network/default.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - lib, - ... -}: +{lib, ...}: with lib; { imports = [ ./ssh.nix diff --git a/modules/common/core/network/ssh.nix b/modules/common/core/network/ssh.nix index 2937f373c..d67dbcaf8 100644 --- a/modules/common/core/network/ssh.nix +++ b/modules/common/core/network/ssh.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: { +{lib, ...}: { services.openssh = { enable = true; startWhenNeeded = true; diff --git a/modules/common/core/nix/default.nix b/modules/common/core/nix/default.nix index 5d6750c3f..b03a01992 100644 --- a/modules/common/core/nix/default.nix +++ b/modules/common/core/nix/default.nix @@ -3,7 +3,7 @@ pkgs, lib, inputs, - self, + inputs', ... }: with lib; { @@ -33,7 +33,7 @@ with lib; { nurpkgs = prev; pkgs = prev; repoOverrides = { - bella = inputs.bella-nur.packages.${prev.system}; + bella = inputs'.bella-nur.packages; }; }; }) @@ -42,15 +42,16 @@ with lib; { # faster rebuilding documentation = { - enable = true; doc.enable = false; - man.enable = true; - dev.enable = false; + nixos.enable = false; + info.enable = false; + man = { + enable = lib.mkDefault true; + generateCaches = lib.mkDefault true; + }; }; - nix = let - mappedRegistry = mapAttrs (_: v: {flake = v;}) inputs; - in { + nix = { # Make builds run with low priority so my system stays responsive daemonCPUSchedPolicy = "idle"; daemonIOSchedClass = "idle"; diff --git a/modules/common/core/system/services.nix b/modules/common/core/system/services.nix index 7819a3edd..3b8666f5a 100644 --- a/modules/common/core/system/services.nix +++ b/modules/common/core/system/services.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + lib, + config, + ... +}: { services = { # monitor and control temparature thermald.enable = true; @@ -8,10 +12,50 @@ fstrim.enable = true; # firmware updater for machine hardware fwupd.enable = true; + # I don't use lvm, can be disabled + lvm.enable = lib.mkDefault false; + # enable smartd monitoering + smartd.enable = true; # limit systemd journal size journald.extraConfig = '' - SystemMaxUse=50M - RuntimeMaxUse=10M + SystemMaxUse=100M + RuntimeMaxUse=50M + SystemMaxFileSize=50M ''; }; + systemd = + { + /* + place services here + */ + } + // lib.optionalAttrs (config.security.auditd.enable) { + # a systemd timer to clean /var/log/audit.log daily + # this can probably be weekly, but daily means we get to clean it every 2-3 days instead of once a week + timers."clean-audit-log" = { + description = "Periodically clean audit log"; + wantedBy = ["timers.target"]; + timerConfig = { + OnCalendar = "daily"; + Persistent = true; + }; + }; + + # clean audit log if it's more than 524,288,000 bytes, which is roughly 500 megabytes + # it can grow MASSIVE in size if left unchecked + services."clean-audit-log" = { + script = '' + set -eu + if [[ $(stat -c "%s" /var/log/audit/audit.log) -gt 524288000 ]]; then + echo "Clearing Audit Log"; + rm -rvf /var/log/audit/audit.log; + echo "Done!" + fi + ''; + serviceConfig = { + Type = "oneshot"; + User = "root"; + }; + }; + }; } diff --git a/modules/common/system/display/default.nix b/modules/common/system/display/default.nix index c32c5f960..7344e3fd3 100644 --- a/modules/common/system/display/default.nix +++ b/modules/common/system/display/default.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - config, - ... -}: { +_: { imports = [ ./wayland ]; diff --git a/modules/common/system/display/wayland/portals.nix b/modules/common/system/display/wayland/portals.nix index 5e73a5efd..62e356e1f 100644 --- a/modules/common/system/display/wayland/portals.nix +++ b/modules/common/system/display/wayland/portals.nix @@ -2,7 +2,7 @@ config, lib, pkgs, - inputs, + inputs', ... }: let cfg = config.modules.system.video; @@ -14,9 +14,9 @@ in { enable = true; extraPortals = with pkgs; - with inputs; [ + with inputs'; [ xdg-desktop-portal-gtk - xdg-portal-hyprland.packages.${pkgs.system}.default + xdg-portal-hyprland.packages.default ]; # xdg-desktop-wlr (this section) is no longer needed, xdg-desktop-portal-hyprland # will (and should) override this one, set to false or remove this section diff --git a/modules/common/system/hardware/cpu/amd/default.nix b/modules/common/system/hardware/cpu/amd/default.nix index 5eedc6572..1c721a612 100644 --- a/modules/common/system/hardware/cpu/amd/default.nix +++ b/modules/common/system/hardware/cpu/amd/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkg, ... }: with lib; let diff --git a/modules/common/system/hardware/smb/genral/default.nix b/modules/common/system/hardware/smb/genral/default.nix index ab26a4c69..a106ce8b1 100644 --- a/modules/common/system/hardware/smb/genral/default.nix +++ b/modules/common/system/hardware/smb/genral/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: with lib; let diff --git a/modules/common/system/hardware/smb/media/default.nix b/modules/common/system/hardware/smb/media/default.nix index 87da0d091..f5cd08bb9 100644 --- a/modules/common/system/hardware/smb/media/default.nix +++ b/modules/common/system/hardware/smb/media/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: with lib; let diff --git a/modules/common/system/hardware/type/default.nix b/modules/common/system/hardware/type/default.nix index d1399e615..37600be33 100644 --- a/modules/common/system/hardware/type/default.nix +++ b/modules/common/system/hardware/type/default.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - config, - ... -}: { +_: { imports = [ ./laptop #../desktop diff --git a/modules/common/system/hardware/type/laptop/power/plugged.nix b/modules/common/system/hardware/type/laptop/power/plugged.nix index 0ae8a19f7..e89b32ad4 100644 --- a/modules/common/system/hardware/type/laptop/power/plugged.nix +++ b/modules/common/system/hardware/type/laptop/power/plugged.nix @@ -1,10 +1,10 @@ { pkgs, lib, - inputs, + inputs', ... }: let - programs = lib.makeBinPath [inputs.hyprland.packages.${pkgs.system}.default]; + programs = lib.makeBinPath [inputs'.hyprland.packages.default]; in { unplugged = pkgs.writeShellScript "unplugged" '' export PATH=$PATH:${programs} diff --git a/modules/common/system/media/sound/default.nix b/modules/common/system/media/sound/default.nix index 651108329..e26e0b429 100644 --- a/modules/common/system/media/sound/default.nix +++ b/modules/common/system/media/sound/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/common/system/module/usrEnv.nix b/modules/common/system/module/usrEnv.nix index 6fd1f6fd5..6940cb81d 100644 --- a/modules/common/system/module/usrEnv.nix +++ b/modules/common/system/module/usrEnv.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{lib, ...}: with lib; { options.modules.usrEnv = { # should wayland module be loaded? this will include: diff --git a/modules/extra/desktop/default.nix b/modules/extra/desktop/default.nix index 3c3f2ee0f..57a36a0aa 100644 --- a/modules/extra/desktop/default.nix +++ b/modules/extra/desktop/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +_: { imports = [ ./system ]; diff --git a/modules/extra/desktop/system/environment.nix b/modules/extra/desktop/system/environment.nix index 5c71e72ec..9fd0bea58 100644 --- a/modules/extra/desktop/system/environment.nix +++ b/modules/extra/desktop/system/environment.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: with lib; let diff --git a/modules/extra/desktop/system/fonts.nix b/modules/extra/desktop/system/fonts.nix index 1e37da5b5..edca2c8b6 100644 --- a/modules/extra/desktop/system/fonts.nix +++ b/modules/extra/desktop/system/fonts.nix @@ -2,7 +2,6 @@ config, pkgs, lib, - inputs, ... }: with lib; let diff --git a/modules/extra/desktop/system/misc.nix b/modules/extra/desktop/system/misc.nix index 6b33ce913..d383e7b47 100644 --- a/modules/extra/desktop/system/misc.nix +++ b/modules/extra/desktop/system/misc.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: diff --git a/modules/extra/desktop/system/programs/cli.nix b/modules/extra/desktop/system/programs/cli.nix index 9e699e717..eeb62596a 100644 --- a/modules/extra/desktop/system/programs/cli.nix +++ b/modules/extra/desktop/system/programs/cli.nix @@ -1,12 +1,8 @@ { config, - pkgs, - lib, inputs, ... -}: let - env = config.modules.usrEnv; -in { +}: { imports = [ inputs.nh.nixosModules.default ]; diff --git a/modules/extra/desktop/system/programs/default.nix b/modules/extra/desktop/system/programs/default.nix index 066adc579..d0e5f93c4 100644 --- a/modules/extra/desktop/system/programs/default.nix +++ b/modules/extra/desktop/system/programs/default.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +_: { imports = [ ./flatpak diff --git a/modules/extra/desktop/system/programs/flatpak/default.nix b/modules/extra/desktop/system/programs/flatpak/default.nix index 9f7a7b058..a74b47da2 100644 --- a/modules/extra/desktop/system/programs/flatpak/default.nix +++ b/modules/extra/desktop/system/programs/flatpak/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +_: { # enable flatpak, as well as xdgp to communicate with the host filesystems services.flatpak.enable = false; diff --git a/modules/extra/desktop/system/programs/gui.nix b/modules/extra/desktop/system/programs/gui.nix index 2adec9cd6..98c8ad005 100644 --- a/modules/extra/desktop/system/programs/gui.nix +++ b/modules/extra/desktop/system/programs/gui.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { environment = { systemPackages = with pkgs; [ # packages necessery for thunar thumbnails diff --git a/modules/extra/desktop/system/services/login.nix b/modules/extra/desktop/system/services/login.nix index ebe89631d..dfe86b204 100644 --- a/modules/extra/desktop/system/services/login.nix +++ b/modules/extra/desktop/system/services/login.nix @@ -3,11 +3,7 @@ lib, pkgs, ... -}: -with lib; let - env = config.modules.usrEnv; - sys = config.modules.system; -in { +}: { config = { # unlock GPG keyring on login security.pam.services.login = { diff --git a/modules/extra/desktop/system/services/printing.nix b/modules/extra/desktop/system/services/printing.nix index 8fea1cdd5..356612988 100644 --- a/modules/extra/desktop/system/services/printing.nix +++ b/modules/extra/desktop/system/services/printing.nix @@ -5,7 +5,6 @@ ... }: with lib; let - device = config.modules.device; sys = config.modules.system; in { config = mkIf (sys.printing.enable) { diff --git a/modules/profiles/home/style.nix b/modules/profiles/home/style.nix index 1a7ab2dc8..5dad2eb79 100644 --- a/modules/profiles/home/style.nix +++ b/modules/profiles/home/style.nix @@ -1,12 +1,9 @@ { lib, pkgs, - config, ... }: let - inherit (lib) mkIf mkOption mkEnableOption types; - inherit (builtins) toString; - cfg = config.profiles.style; + inherit (lib) mkOption mkEnableOption types; in { options = { profiles = {