From edf0326c049eb6fac4486ae8a301516d06b5ed54 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 12:23:25 +0200 Subject: [PATCH 1/6] zellij/module.nix: disable zellij --- modules/programs/tui/zellij/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/tui/zellij/module.nix b/modules/programs/tui/zellij/module.nix index 9ee55df..a0ccdc3 100644 --- a/modules/programs/tui/zellij/module.nix +++ b/modules/programs/tui/zellij/module.nix @@ -7,6 +7,6 @@ }); in { environment.systemPackages = builtins.attrValues { - inherit patched-zellij; + # inherit patched-zellij; }; } From 388104ce8878fd0ff9c9e6986de7dcb08c0c7e52 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 14:46:33 +0200 Subject: [PATCH 2/6] modules/other/users.nix: add user options --- modules/options/meta/module.nix | 35 ----------------- modules/other/users.nix | 67 ++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 52 deletions(-) delete mode 100644 modules/options/meta/module.nix diff --git a/modules/options/meta/module.nix b/modules/options/meta/module.nix deleted file mode 100644 index 4440d8c..0000000 --- a/modules/options/meta/module.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (builtins) elemAt; - inherit (lib) options types; - inherit (options) mkOption; - inherit (types) listOf str; -in { - options.meta = { - users = mkOption { - type = listOf str; - default = ["cr"]; - description = '' - A list of users on a system. - ''; - }; - mainUser = { - username = mkOption { - type = str; - default = elemAt config.meta.users 0; - description = '' - The main user for each system. This is the first element of the list of users by default. - ''; - }; - gitSigningKey = mkOption { - type = str; - description = '' - The main user's git signing key, used to automatically sing git commits with this key - ''; - }; - }; - }; -} diff --git a/modules/other/users.nix b/modules/other/users.nix index 75d41a9..1fa4711 100644 --- a/modules/other/users.nix +++ b/modules/other/users.nix @@ -1,29 +1,62 @@ { config, + lib, pkgs, self, ... }: let + inherit (builtins) elemAt; + inherit (lib.options) mkOption; + inherit (lib.types) listOf str; + inherit (config.meta.mainUser) username; in { - users = { - mutableUsers = true; - users = { - ${username} = { - isNormalUser = true; - extraGroups = [ - "wheel" - "networking" - "video" - "networkmanager" - "audio" - "nix" - "docker" - ]; - shell = self.packages.${pkgs.stdenv.system}.fish; - # hashedPasswordFile = "/etc/passwords/cr"; + options.meta = { + users = mkOption { + type = listOf str; + default = ["cr"]; + description = '' + A list of users on a system. + ''; + }; + mainUser = { + username = mkOption { + type = str; + default = elemAt config.meta.users 0; + description = '' + The main user for each system. This is the first element of the list of users by default. + ''; + }; + gitSigningKey = mkOption { + type = str; + description = '' + The main user's git signing key, used to automatically sing git commits with this key + ''; + default = '' + ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw== ''; + }; + }; + }; + config = { + users = { + mutableUsers = true; + users = { + ${username} = { + isNormalUser = true; + extraGroups = [ + "wheel" + "networking" + "video" + "networkmanager" + "audio" + "nix" + "docker" + ]; + shell = self.packages.${pkgs.stdenv.system}.fish; + # hashedPasswordFile = "/etc/passwords/cr"; + }; + # root.hashedPasswordFile = "/persist/passwords/root"; }; - # root.hashedPasswordFile = "/persist/passwords/root"; }; }; } From 617966a6cc6c5b6807c562e4188b92527a3476c6 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 14:46:33 +0200 Subject: [PATCH 3/6] flake: move grapics settings into graphics.nix --- modules/options/system/hardware.nix | 10 --------- modules/options/system/module.nix | 2 -- modules/system/hardware/graphics.nix | 33 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 modules/options/system/hardware.nix diff --git a/modules/options/system/hardware.nix b/modules/options/system/hardware.nix deleted file mode 100644 index 6fc8b87..0000000 --- a/modules/options/system/hardware.nix +++ /dev/null @@ -1,10 +0,0 @@ -{lib, ...}: let - inherit (lib) mkOption mkEnableOption; -in { - options.modules.system.hardware = { - nvidia = { - enable = mkEnableOption "Nvidia Nvidia graphics drivers"; - }; - amd.enable = mkEnableOption "AMD graphics drivers"; - }; -} diff --git a/modules/options/system/module.nix b/modules/options/system/module.nix index 51c2c46..bce1197 100644 --- a/modules/options/system/module.nix +++ b/modules/options/system/module.nix @@ -29,8 +29,6 @@ in { # monitor configuration ./monitors.nix - - ./hardware.nix ]; options.modules.system = { diff --git a/modules/system/hardware/graphics.nix b/modules/system/hardware/graphics.nix index dae0ada..25e255e 100644 --- a/modules/system/hardware/graphics.nix +++ b/modules/system/hardware/graphics.nix @@ -1,38 +1,37 @@ { config, lib, - pkgs, ... }: let + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; + cfg = config.modules.system.hardware; - inherit (lib) mkIf; - inherit (lib.modules) mkForce; in { + options.modules.system.hardware = { + nvidia = { + enable = mkEnableOption "Nvidia graphics drivers"; + }; + amd.enable = mkEnableOption "AMD graphics drivers"; + }; config = { hardware = { - graphics = { - enable = true; - extraPackages = mkIf cfg.amd.enable (builtins.attrValues { - inherit - (pkgs) - mesa - libva - vaapiVdpa - ; - }); - }; + graphics.enable = true; nvidia = mkIf cfg.nvidia.enable { + # we want the open-source drivers + open = true; + modesetting.enable = true; - open = mkForce true; + nvidiaSettings = false; + + # fixes sleep on nvidia devices powerManagement = { enable = true; finegrained = false; }; - nvidiaSettings = false; package = config.boot.kernelPackages.nvidiaPackages.beta; }; }; - boot.initrd.kernelModules = mkIf cfg.amd.enable ["amdgpu"]; services.xserver.videoDrivers = mkIf cfg.nvidia.enable ["nvidia"]; }; } From c360cc0fd5406bf763606b7664e679107e06a004 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 14:46:33 +0200 Subject: [PATCH 4/6] flake: move options into corresponding files --- modules/options/system/programs/default.nix | 8 -------- modules/programs/gui/steam.nix | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/options/system/programs/default.nix b/modules/options/system/programs/default.nix index df72978..9f7e0d3 100644 --- a/modules/options/system/programs/default.nix +++ b/modules/options/system/programs/default.nix @@ -3,8 +3,6 @@ in { options.modules.system.programs = { editors = { - emacs.enable = mkEnableOption "Emacs operatig system"; - neovim.enable = mkEnableOption "Neovim text editor"; helix.enable = mkEnableOption "Helix text editor"; kakoune.enable = mkEnableOption "Kakoune text editor"; }; @@ -12,13 +10,7 @@ in { discord.enable = mkEnableOption "Discord messenger"; spotify.enable = mkEnableOption "Spotify music client"; zathura.enable = mkEnableOption "Zathura pdf viewer"; - nextcloud.enable = mkEnableOption "Nextcloud sync client"; - firefox.enable = mkEnableOption "Firefox web browser"; - zellij.enable = mkEnableOption "Zellij terminal multiplexer"; - steam.enable = mkEnableOption "Steam games platform"; - eza.enable = mkEnableOption "eza"; - oh-my-posh.enable = mkEnableOption "oh-my-posh"; nushell.enable = mkEnableOption "nushell"; terminals = { foot.enable = mkEnableOption "Foot terminal emulator"; diff --git a/modules/programs/gui/steam.nix b/modules/programs/gui/steam.nix index a027f0f..2b19e16 100644 --- a/modules/programs/gui/steam.nix +++ b/modules/programs/gui/steam.nix @@ -4,9 +4,12 @@ pkgs, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; + cfg = config.modules.system.programs.steam; in { + options.modules.system.programs.steam.enable = mkEnableOption "Steam games platform"; config = mkIf cfg.enable { programs.steam = { enable = true; From 4596f846bfea81fc60ac492d0860787601946d28 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 14:46:33 +0200 Subject: [PATCH 5/6] hosts: update configurations to match removal of some options --- hosts/hermit/configuration.nix | 9 --------- hosts/temperance/configuration.nix | 14 -------------- hosts/tower/configuration.nix | 1 - 3 files changed, 24 deletions(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 06a7e89..11dce4c 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -41,19 +41,10 @@ }; programs = { editors = { - emacs.enable = false; - # only emacs for me, right now. - neovim.enable = true; - # sadly just not advanced enough, yet. helix.enable = true; }; - discord.enable = true; # nushell.enable = true; - eza.enable = true; - firefox.enable = true; - spotify.enable = false; # starship.enable = true; - zellij.enable = true; terminals = { foot.enable = true; }; diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index d986f3c..d7f255f 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -52,24 +52,10 @@ in { }; programs = { editors = { - emacs.enable = false; - # only emacs for me, right now. - neovim.enable = true; - # sadly just not advanced enough, yet. helix.enable = true; - kakoune.enable = true; }; - discord.enable = true; - nushell.enable = true; - oh-my-posh.enable = true; - eza.enable = true; - firefox.enable = true; - spotify.enable = true; - zellij.enable = false; - steam.enable = false; terminals = { foot.enable = true; - kitty.enable = true; }; }; sound.enable = true; diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix index a1428a8..7dfad78 100644 --- a/hosts/tower/configuration.nix +++ b/hosts/tower/configuration.nix @@ -35,7 +35,6 @@ editors = { helix.enable = true; }; - eza.enable = true; }; }; other = { From 8ba97b865d3c451b34e28aeb1210662ce07541be Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 14:46:33 +0200 Subject: [PATCH 6/6] flake: cleanup of some files --- modules/options/system/monitors.nix | 2 +- modules/other/git.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/options/system/monitors.nix b/modules/options/system/monitors.nix index 78d5fe8..4294f2e 100644 --- a/modules/options/system/monitors.nix +++ b/modules/options/system/monitors.nix @@ -1,6 +1,6 @@ {lib, ...}: let inherit (lib) mkOption; - inherit (lib.types) str submodule int ints number attrsOf listOf; + inherit (lib.types) submodule int ints number attrsOf ; in { options.modules.system.hardware.monitors = mkOption { description = "\n List of monitors to use\n "; diff --git a/modules/other/git.nix b/modules/other/git.nix index 1a24704..c5b31c3 100644 --- a/modules/other/git.nix +++ b/modules/other/git.nix @@ -17,8 +17,6 @@ in { pull.ff = "only"; gpg.format = "ssh"; commit.gpgsign = "true"; - # breaks forgejo - # diff.external = "${pkgs.difftastic}/bin/difft"; signing = { key = "${key}";