From e01ffa4cec707e848b77eebbc16e5d7478ff0115 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Tue, 23 Jul 2024 22:00:59 +0200 Subject: [PATCH] . --- config/shell-abbr/default.nix | 2 +- hosts/chris-pc/default.nix | 1 + hosts/chris-pc/hardware.nix | 5 ----- hosts/chris-server/hardware.nix | 5 ----- modules/networking/default.nix | 2 +- modules/networking/samba.nix | 2 +- modules/options.nix | 1 + modules/services/media.nix | 1 - modules/shell/toolset/btop.nix | 2 +- modules/shell/zsh.nix | 4 ++-- modules/themes/default.nix | 7 +------ modules/themes/everforrest/default.nix | 4 ---- modules/{virtualization => virtualisation}/default.nix | 4 ++-- modules/{virtualization => virtualisation}/podman.nix | 6 +++--- 14 files changed, 14 insertions(+), 32 deletions(-) rename modules/{virtualization => virtualisation}/default.nix (59%) rename modules/{virtualization => virtualisation}/podman.nix (70%) diff --git a/config/shell-abbr/default.nix b/config/shell-abbr/default.nix index accda22..8fc9334 100644 --- a/config/shell-abbr/default.nix +++ b/config/shell-abbr/default.nix @@ -1,3 +1,3 @@ { ls = "eza -al"; -}; +} diff --git a/hosts/chris-pc/default.nix b/hosts/chris-pc/default.nix index 719b8ae..d41d166 100644 --- a/hosts/chris-pc/default.nix +++ b/hosts/chris-pc/default.nix @@ -15,6 +15,7 @@ desktop = { plasma.enable = true; + type = "wayland"; terminal = { default = "alacritty"; diff --git a/hosts/chris-pc/hardware.nix b/hosts/chris-pc/hardware.nix index b59c579..97ac14a 100644 --- a/hosts/chris-pc/hardware.nix +++ b/hosts/chris-pc/hardware.nix @@ -32,9 +32,4 @@ in nixpkgs.hostPlatform = mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware; - - services = { - power-profiles-deamon-enable = false; - thermald.enable = false; - }; } diff --git a/hosts/chris-server/hardware.nix b/hosts/chris-server/hardware.nix index 9362264..e7ecc5d 100644 --- a/hosts/chris-server/hardware.nix +++ b/hosts/chris-server/hardware.nix @@ -30,9 +30,4 @@ in nixpkgs.hostPlatform = mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware; - - services = { - power-profiles-deamon-enable = false; - thermald.enable = false; - }; } diff --git a/modules/networking/default.nix b/modules/networking/default.nix index e1f3c9b..27b8a1b 100644 --- a/modules/networking/default.nix +++ b/modules/networking/default.nix @@ -16,7 +16,7 @@ in { enable = mkEnableOption "network manager"; }; - config =mkIf cfg.networkManager.enable { + config = mkIf cfg.enable { systemd.services.NetworkManager-wait-online.enable = false; networking = { diff --git a/modules/networking/samba.nix b/modules/networking/samba.nix index 88d7aff..bbf9852 100644 --- a/modules/networking/samba.nix +++ b/modules/networking/samba.nix @@ -14,7 +14,7 @@ in config = mkMerge [ (mkIf config.modules.networking.samba.sharing.enable { users = { - group.samba-guest = {}; + groups.samba-guest = {}; users.samba-guest = { isSystemUser = true; description = "Residence of our Samba guest users"; diff --git a/modules/options.nix b/modules/options.nix index 0f4d552..71cba78 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -20,6 +20,7 @@ in "${config.user.home}/Github/.files" ]); hostDir = mkOpt path "${config.kaas.dir}/hosts/${config.networking.hostName}"; + configDir = mkOpt path "${config.kaas.dir}/config"; modulesDir = mkOpt path "${config.kaas.dir}/modules"; themesDir = mkOpt path "${config.kaas.modulesDir}/themes"; }; diff --git a/modules/services/media.nix b/modules/services/media.nix index 048de7a..bd611c2 100644 --- a/modules/services/media.nix +++ b/modules/services/media.nix @@ -79,7 +79,6 @@ in enable = true; openFirewall = true; configFile = "${directory}/sabnzbd/config.ini"; - port = 5001; user = user; group = group; diff --git a/modules/shell/toolset/btop.nix b/modules/shell/toolset/btop.nix index 43b745e..e79baf3 100644 --- a/modules/shell/toolset/btop.nix +++ b/modules/shell/toolset/btop.nix @@ -90,7 +90,7 @@ in }; }; - home.configFile.btop-theme = let + create.configFile.btop-theme = let inherit (config.modules.themes) active; in mkIf (active != null) { diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index fa86e8c..bd8c759 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -132,10 +132,10 @@ in }; }; - home.configFile.zsh-abbreviations = { + create.configFile.zsh-abbreviations = { target = "zsh/abbreviations"; text = let - abbrevs = import "${config.snowflake.configDir}/shell-abbr"; + abbrevs = import "${config.kaas.configDir}/shell-abbr"; in '' ${concatStrings (mapAttrsToList (k: v: "abbr ${k}=${escapeNixString v}") diff --git a/modules/themes/default.nix b/modules/themes/default.nix index 534a5f3..9e9b201 100644 --- a/modules/themes/default.nix +++ b/modules/themes/default.nix @@ -164,12 +164,7 @@ in { package = iconTheme.package; }; gtk3.bookmarks = map (dir: "file://${config.user.home}/" + dir) [ - "Workspace/public/snowflake" - "Workspace/public/cs-notes" - "Workspace/public/notebook" - "Library/unexplored" - "Library/unexplored/mathematics" - "Library/unexplored/programming" + "data/Github/.files" ]; gtk4.extraConfig = { gtk-cursor-blink = false; diff --git a/modules/themes/everforrest/default.nix b/modules/themes/everforrest/default.nix index 690c8c4..b969a67 100644 --- a/modules/themes/everforrest/default.nix +++ b/modules/themes/everforrest/default.nix @@ -97,10 +97,6 @@ in }; editor = { - helix = { - dark = "everforrest"; - light = "everforrest_storm"; - }; neovim = { dark = "everforrest"; light = "everforrest"; diff --git a/modules/virtualization/default.nix b/modules/virtualisation/default.nix similarity index 59% rename from modules/virtualization/default.nix rename to modules/virtualisation/default.nix index 5a75009..97175c7 100644 --- a/modules/virtualization/default.nix +++ b/modules/virtualisation/default.nix @@ -3,10 +3,10 @@ let inherit (lib.modules) mkIf; in { - options.modules.virtualization = let + options.modules.virtualisation = let inherit (lib.options) mkEnableOption; in { - enable = mkEnableOption "enable virtualization"; + enable = mkEnableOption "enable virtualisation"; }; } diff --git a/modules/virtualization/podman.nix b/modules/virtualisation/podman.nix similarity index 70% rename from modules/virtualization/podman.nix rename to modules/virtualisation/podman.nix index 268d67e..27cde69 100644 --- a/modules/virtualization/podman.nix +++ b/modules/virtualisation/podman.nix @@ -2,17 +2,17 @@ let inherit (lib.modules) mkIf; - cfg = config.modules.virtualization.podman; + cfg = config.modules.virtualisation.podman; in { - options.modules.virtualization.podman = let + options.modules.virtualisation.podman = let inherit (lib.options) mkEnableOption; in { enable = mkEnableOption "enable podman"; }; - config = mkIf options.modules.virtualization.podman.enable { + config = mkIf options.modules.virtualisation.podman.enable { virtualisation = { containers.enable = true;