diff options
36 files changed, 117 insertions, 116 deletions
@@ -91,7 +91,8 @@ "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", - "tatuin": "tatuin" + "tatuin": "tatuin", + "treefmt-nix": "treefmt-nix" } }, "sops-nix": { @@ -151,6 +152,26 @@ "repo": "tatuin", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", @@ -21,25 +21,31 @@ }; treefmt-nix = { - url = "github:numtide/treefmt-nix"; + url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = - { self, nixpkgs, nixpkgs-stable, treefmt-nix, ... }@inputs: let - lib = nixpkgs.lib; + { + self, + nixpkgs, + treefmt-nix, + ... + }@inputs: + let + lib = nixpkgs.lib; systems = [ "x86_64-linux" "aarch64-linux" - ]; - forAllSystems = f: (lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system })); - treefmtEval = forAllSystems (pkgs: treefmt-nix.lib.evalModule pkgs ./modules/treefmt.nix); - in + ]; + forAllSystems = f: (lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system})); + treefmtEval = forAllSystems (pkgs: treefmt-nix.lib.evalModule pkgs ./modules/treefmt.nix); + in { # packages."x86_64-linux".full-iso = self.nixosConfigurations.full-iso.config.system.build.isoImage; packages = ( - forAllSystems (pkgs: { + forAllSystems (_pkgs: { }) ); @@ -100,19 +106,22 @@ specialArgs = { inherit inputs; }; - system = "x86_64-linux"; + system = "x86_64-linux"; modules = [ - ./modules - ./hosts/test_vm + ./modules + ./hosts/test_vm ./users/live-user.nix - ({lib, ...}: { - addons.desktop.hyprland.enable = lib.mkForce false; - addons.desktop.xfce.enable = lib.mkForce false; - }) + ( + { lib, ... }: + { + addons.desktop.hyprland.enable = lib.mkForce false; + addons.desktop.xfce.enable = lib.mkForce false; + } + ) inputs.home-manager.nixosModules.default inputs.sops-nix.nixosModules.sops ]; - }; + }; }; }; } diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix index aa7c010..ece0543 100644 --- a/home-modules/apps/default.nix +++ b/home-modules/apps/default.nix @@ -3,7 +3,7 @@ pkgs, inputs, config, - hostconfig, + hostconfig, ... }: with lib; @@ -57,9 +57,9 @@ in home.packages = with pkgs; [ lm_sensors nix-output-monitor - ripgrep - unzip - iputils + ripgrep + unzip + iputils inetutils htop git @@ -88,13 +88,13 @@ in xdg-user-dirs zsh file - bat + bat jq ]; }) (lib.mkIf cfg.browser.enable { home.packages = with pkgs; [ - lynx + lynx ]; }) (lib.mkIf cfg.note-taking.enable { @@ -108,8 +108,8 @@ in ]; }) (lib.mkIf cfg.dev.enable { - homeapps.nvim = { - enable = true; + homeapps.nvim = { + enable = true; lsp = true; }; home.packages = with pkgs; [ diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix index 64f1382..9a6f0e4 100644 --- a/home-modules/apps/desktop/default.nix +++ b/home-modules/apps/desktop/default.nix @@ -29,11 +29,11 @@ in variant = "mocha"; }) ]; - # Use fcitx + # Use fcitx i18n.inputMethod = { type = "fcitx5"; enable = true; - fcitx5 = { + fcitx5 = { waylandFrontend = true; addons = with pkgs; [ fcitx5-gtk @@ -45,7 +45,7 @@ in }; }; - # Install the theme for fcitx + # Install the theme for fcitx home.file."/.local/share/fcitx5/themes".source = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes"; }) (lib.mkIf cfg.email.enable { diff --git a/home-modules/apps/desktop/floorp.nix b/home-modules/apps/desktop/floorp.nix index b5b2cec..52c14b8 100644 --- a/home-modules/apps/desktop/floorp.nix +++ b/home-modules/apps/desktop/floorp.nix @@ -1,3 +1,3 @@ -{ pkgs, config, ... }: +{ ... }: { } diff --git a/home-modules/apps/desktop/ghidra.nix b/home-modules/apps/desktop/ghidra.nix index 6e5b8c3..52c14b8 100644 --- a/home-modules/apps/desktop/ghidra.nix +++ b/home-modules/apps/desktop/ghidra.nix @@ -1,3 +1,3 @@ -{ pkgs, ... }: +{ ... }: { } diff --git a/home-modules/apps/desktop/wine.nix b/home-modules/apps/desktop/wine.nix index a23f44a..ec4f7a9 100644 --- a/home-modules/apps/desktop/wine.nix +++ b/home-modules/apps/desktop/wine.nix @@ -1,7 +1,5 @@ { pkgs, - config, - lib, ... }: { diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix index b494660..c99a343 100644 --- a/home-modules/apps/nvim/default.nix +++ b/home-modules/apps/nvim/default.nix @@ -11,7 +11,7 @@ in { options.homeapps.nvim = { enable = lib.mkEnableOption "Enables neovim configuration"; - lsp = lib.mkEnableOption "Enables LSP Support and the needed servers"; + lsp = lib.mkEnableOption "Enables LSP Support and the needed servers"; }; config = lib.mkIf config.homeapps.nvim.enable { @@ -65,6 +65,7 @@ in ++ [ ts_ls vue_ls - ]); + ] + ); }; } diff --git a/home-modules/default.nix b/home-modules/default.nix index 8b84948..5286b0b 100644 --- a/home-modules/default.nix +++ b/home-modules/default.nix @@ -1,7 +1,5 @@ { - pkgs, config, - input, ... }: { @@ -16,6 +14,5 @@ age.keyFile = "/home/${config.home.username}/.config/sops/age/keys.txt"; defaultSopsFile = ../secrets/secrets.yaml; }; - } diff --git a/home-modules/desktop/default.nix b/home-modules/desktop/default.nix index 6e88a5c..4af361e 100644 --- a/home-modules/desktop/default.nix +++ b/home-modules/desktop/default.nix @@ -1,4 +1,4 @@ -{ pkgs, hostconfig, ... }: +{ ... }: { imports = [ ./wayland diff --git a/home-modules/desktop/wayland/default.nix b/home-modules/desktop/wayland/default.nix index ebf5439..30bf34d 100644 --- a/home-modules/desktop/wayland/default.nix +++ b/home-modules/desktop/wayland/default.nix @@ -1,4 +1,4 @@ -{ pkgs, hostconfig, ... }: +{ ... }: { imports = [ ./waybar.nix diff --git a/home-modules/desktop/wayland/mako.nix b/home-modules/desktop/wayland/mako.nix index 7dac41c..ddf0a91 100644 --- a/home-modules/desktop/wayland/mako.nix +++ b/home-modules/desktop/wayland/mako.nix @@ -1,7 +1,5 @@ { - pkgs, config, - hostconfig, lib, ... }: diff --git a/home-modules/desktop/wayland/waybar.nix b/home-modules/desktop/wayland/waybar.nix index 6088cee..6067c93 100644 --- a/home-modules/desktop/wayland/waybar.nix +++ b/home-modules/desktop/wayland/waybar.nix @@ -1,6 +1,4 @@ { - pkgs, - hostconfig, lib, config, ... diff --git a/home-modules/services/default.nix b/home-modules/services/default.nix index 9f13709..34933fa 100644 --- a/home-modules/services/default.nix +++ b/home-modules/services/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./vdirsyncer.nix diff --git a/home-modules/services/direnv.nix b/home-modules/services/direnv.nix index 9ddab97..7b7d96d 100644 --- a/home-modules/services/direnv.nix +++ b/home-modules/services/direnv.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/home-modules/services/syncthing.nix b/home-modules/services/syncthing.nix index b518dd6..f38acff 100644 --- a/home-modules/services/syncthing.nix +++ b/home-modules/services/syncthing.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: diff --git a/home-modules/services/vdirsyncer.nix b/home-modules/services/vdirsyncer.nix index a849637..df76bc8 100644 --- a/home-modules/services/vdirsyncer.nix +++ b/home-modules/services/vdirsyncer.nix @@ -1,6 +1,4 @@ { - pkgs, - inputs, config, lib, ... diff --git a/hosts/apocalypse/backup.nix b/hosts/apocalypse/backup.nix index 1942d66..a3f6e77 100644 --- a/hosts/apocalypse/backup.nix +++ b/hosts/apocalypse/backup.nix @@ -1,8 +1,5 @@ { - config, - lib, pkgs, - modulesPath, ... }: { diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix index e8fc86c..5e13448 100644 --- a/hosts/apocalypse/default.nix +++ b/hosts/apocalypse/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: { imports = [ ./hardware-configuration.nix @@ -106,7 +106,7 @@ }; services.thinkfan = { - enable = true; + enable = true; levels = [ [ 0 @@ -114,7 +114,7 @@ 55 ] [ - 1 + 1 48 60 ] @@ -124,8 +124,8 @@ 65 ] [ - 3 - 55 + 3 + 55 67 ] [ @@ -144,7 +144,7 @@ 72 ] [ - 7 + 7 66 85 ] diff --git a/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix index 8c5dadb..05feacf 100644 --- a/hosts/apocalypse/firewall.nix +++ b/hosts/apocalypse/firewall.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ ... }: let baseTCP = [ 22000 # Syncthng diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix index 0d17b61..74b1101 100644 --- a/hosts/apocalypse/hardware-configuration.nix +++ b/hosts/apocalypse/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: @@ -143,25 +142,25 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # Copied from nix wiki to save on battery life. + # Copied from nix wiki to save on battery life. services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 20; - #Optional helps save long term battery health - START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge - STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging + #Optional helps save long term battery health + START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge + STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging - }; + }; }; } diff --git a/hosts/apocalypse/nvidia.nix b/hosts/apocalypse/nvidia.nix index ccfc6d8..db2e80a 100644 --- a/hosts/apocalypse/nvidia.nix +++ b/hosts/apocalypse/nvidia.nix @@ -1,8 +1,5 @@ { config, - lib, - pkgs, - modulesPath, ... }: { diff --git a/hosts/full-iso/default.nix b/hosts/full-iso/default.nix index e17e620..8d6199a 100644 --- a/hosts/full-iso/default.nix +++ b/hosts/full-iso/default.nix @@ -1,4 +1,4 @@ -{ modulesPath, pkgs, ... }: +{ modulesPath, ... }: { imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-base.nix") diff --git a/hosts/test_vm/default.nix b/hosts/test_vm/default.nix index 7d84448..6dd2fc1 100644 --- a/hosts/test_vm/default.nix +++ b/hosts/test_vm/default.nix @@ -1,7 +1,4 @@ { - pkgs, - lib, - inputs, ... }: { @@ -27,6 +24,10 @@ fileSystems."/" = { device = "none"; fsType = "tmpfs"; - options = [ "defaults" "size=2G" "mode=755" ]; + options = [ + "defaults" + "size=2G" + "mode=755" + ]; }; } diff --git a/modules/btrfs.nix b/modules/btrfs.nix index 7c4e964..85b0ac0 100644 --- a/modules/btrfs.nix +++ b/modules/btrfs.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/default.nix b/modules/default.nix index 3640cf4..c2cb665 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,5 @@ { pkgs, - lib, - config, inputs, ... }: @@ -17,10 +15,10 @@ ]; nixpkgs.overlays = [ - (import ../overlays/stable_overrides.nix { - nixpkgs-stable = inputs.nixpkgs-stable; - inherit pkgs; - }) + (import ../overlays/stable_overrides.nix { + nixpkgs-stable = inputs.nixpkgs-stable; + inherit pkgs; + }) ]; nix.settings.experimental-features = [ @@ -37,7 +35,6 @@ }; time.timeZone = "Europe/Amsterdam"; # Set timezone - sops.defaultSopsFile = ./secrets/secrets.yaml; sops.age.sshKeyPaths = [ "/etc/ssh_host_ed25519_key" ]; sops.age.keyFile = "/var/lib/sops-nix/key.txt"; diff --git a/modules/desktop/common.nix b/modules/desktop/common.nix index d5bb8fd..2632a19 100644 --- a/modules/desktop/common.nix +++ b/modules/desktop/common.nix @@ -32,11 +32,11 @@ networkmanagerapplet (catppuccin-sddm.override { flavor = "mocha"; - accent = "pink"; - font = "Noto Sans"; - fontSize = "11"; - background = "${../sddm_bg.png}"; - loginBackground = true; + accent = "pink"; + font = "Noto Sans"; + fontSize = "11"; + background = "${../sddm_bg.png}"; + loginBackground = true; }) # disabled because it imports a unsafe package # surf # A basic browser in case we don't want to import a larger browser diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index be082bc..2cfe5bf 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/desktop/steam.nix b/modules/desktop/steam.nix index a78c7c4..ee4a69b 100644 --- a/modules/desktop/steam.nix +++ b/modules/desktop/steam.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: diff --git a/modules/gpg.nix b/modules/gpg.nix index 0fa48e6..b2651b9 100644 --- a/modules/gpg.nix +++ b/modules/gpg.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/modules/nh.nix b/modules/nh.nix index 832fbeb..49e987b 100644 --- a/modules/nh.nix +++ b/modules/nh.nix @@ -1,9 +1,11 @@ -{pkgs, lib, config, ... }: let +{ lib, config, ... }: +let conf = config.addons.nh; -in { +in +{ options.addons.nh = { enable = lib.mkOption { - default = true; + default = true; description = "Enable nix cli helper"; }; @@ -11,7 +13,7 @@ in { default = "/home/wilkuu/nix-config/"; description = "Flake location for nh to use"; }; - }; + }; config = { programs.nh = { diff --git a/modules/treefmt.nix b/modules/treefmt.nix index ab36cdb..5d0b979 100644 --- a/modules/treefmt.nix +++ b/modules/treefmt.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ ... }: +{ # Used to find the project root projectRootFile = "flake.nix"; programs.nixfmt.enable = true; diff --git a/overlays/stable_overrides.nix b/overlays/stable_overrides.nix index 87c3a0f..f32cae2 100644 --- a/overlays/stable_overrides.nix +++ b/overlays/stable_overrides.nix @@ -1,8 +1,4 @@ -{nixpkgs, nixpkgs-stable, ...}: - (final: prev: - let - pkgs-stable = nixpkgs-stable.legacyPackages.${prev.system}; - in { - - }) +{ nixpkgs-stable, ... }: +(_final: prev: { +}) diff --git a/users/live-user.nix b/users/live-user.nix index d5e9d2c..226fbe7 100644 --- a/users/live-user.nix +++ b/users/live-user.nix @@ -25,8 +25,8 @@ home-manager.users.live-user = { imports = [ ../home-modules ]; - homeapps = { - nvim.enable = true; + homeapps = { + nvim.enable = true; nvim.lsp = false; presets = { diff --git a/users/user-common.nix b/users/user-common.nix index 4d0e8ad..b9f246f 100644 --- a/users/user-common.nix +++ b/users/user-common.nix @@ -1,5 +1,4 @@ { - pkgs, config, inputs, ... diff --git a/users/wilkuu.nix b/users/wilkuu.nix index 63d6c88..8804ebb 100644 --- a/users/wilkuu.nix +++ b/users/wilkuu.nix @@ -1,7 +1,5 @@ { pkgs, - lib, - config, ... }: { @@ -49,6 +47,6 @@ home.homeDirectory = "/home/wilkuu"; home.stateVersion = "24.11"; programs.home-manager.enable = true; - }; + }; } |