Move and rename some stuff whatever

2024-12-09 23:07:20 -05:00 · 2024-12-09 23:07:20 -05:00 · 7c5ff0253e
parent a0cc623c4b
commit 7c5ff0253e
38 changed files with 53 additions and 127 deletions
--- a/hosts/tower/filesystems/default.nix
+++ b/hosts/tower/filesystems/default.nix
@ -37,7 +37,7 @@
    "/home/jimbo/JimboNFS" = {
      device = "${config.ips.server}:/export/JimboNFS";
      fsType = "nfs4";
-      options = [ "x-systemd.automount" "noauto" ];
+      options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
    };
  };
 }
--- a/modules/home/files/default.nix
+++ b/modules/home/files/default.nix
@ -1,16 +1,8 @@
 { pkgs, ... }: {
  home.file = {
-    ".face" = {
-      source = ./assets/pfp.png;
-    };
-    ".assets/wallpapers" = {
-      source = ./assets/wallpapers;
-    };
-    ".assets/lockscreen" = {
-      source = ./assets/lockscreen;
-    };
-    ".alsoftrc" = {
-      text = ''drivers=pulse'';
-    };
+    ".face".source = ./assets/pfp.png;
+    ".assets/wallpapers".source = ./assets/wallpapers;
+    ".assets/lockscreen".source = ./assets/lockscreen;
+    ".alsoftrc".text = ''drivers=pulse'';
  };
 }
--- a/modules/home/options/default.nix
+++ b/modules/home/options/default.nix
@ -3,6 +3,5 @@ with lib; {
  options.home.desktop.enable = mkOption {
    type = types.bool;
    default = true;
-    description = "Enable desktop apps and services, but home-manager";
  };
 }
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@ -207,7 +207,7 @@ in {
      "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";

      "network.trr.mode" = 3;
-      "network.trr.uri" = "https://doh.libredns.gr/noads";
+      "network.trr.uri" = "https://wikimedia-dns.org/dns-query";
      "network.cookie.cookieBehavior" = 1;
      "network.cookie.sameSite.noneRequiresSecure" = true;
      "network.http.referer.XOriginPolicy" = 2;
--- a/modules/home/programs/gui/pcmanfm/default.nix
+++ b/modules/home/programs/gui/pcmanfm/default.nix
@ -38,9 +38,9 @@
      ".config/libfm/libfm.conf".text = ''
        [config]
        single_click=0
-        use_trash=0
+        use_trash=1
        confirm_del=1
-        confirm_trash=0
+        confirm_trash=1
        advanced_mode=1
        si_unit=0
        force_startup_notify=1
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@ -6,6 +6,7 @@
    ./git
    ./ncmpcpp
    ./neovim
+    ./nh
    ./ranger
    ./tmux
    ./zsh
--- a/modules/home/programs/terminal/nh/default.nix
+++ b/modules/home/programs/terminal/nh/default.nix
@ -2,7 +2,6 @@
 {
  programs.nh = {
    enable = true;
-    clean.enable = true;
    flake = "/etc/nixos";
  };
 }
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@ -11,14 +11,14 @@
    };
    shellAliases = {
      # NixOS
-      flakedate = "sudo nix flake update --flake /etc/nixos";
-      nhs = "sudo nh os switch -R /etc/nixos";
+      flakedate = "doas nix flake update --flake /etc/nixos";
+      nhs = "doas nh os switch -R /etc/nixos";
      nhu = "flakedate && nhs";
      ns = "nix-shell -p";

-      nixclean = "sudo nix-store --gc; nix-collect-garbage -d";
-      nixpurge = "sudo nix-collect-garbage --delete-old";
-      nixoptimize = "sudo nix store optimise";
+      nixclean = "doas nix-store --gc; nix-collect-garbage -d";
+      nixpurge = "doas nix-collect-garbage --delete-old";
+      nixoptimize = "doas nix store optimise";
      nixscrub = "nixclean; nixpurge; nixoptimize";

      # Shortcuts
--- a/modules/system/accounts/groups/admin/default.nix
+++ b/modules/system/accounts/groups/admin/default.nix
@ -1,6 +0,0 @@
-{ ... }:
-{
-  users.groups.admin = {
-    gid = 515;
-  };
-}
--- a/modules/system/accounts/groups/default.nix
+++ b/modules/system/accounts/groups/default.nix
@ -1,7 +1,4 @@
 { ... }:
 {
-  imports = [
-    ./admin
-    ./nfsShare
-  ];
+  imports = [ ./nfsShare ];
 }
--- a/modules/system/accounts/users/default.nix
+++ b/modules/system/accounts/users/default.nix
@ -8,8 +8,5 @@
    home-manager.nixosModules.home-manager
  ];

-  users = {
-    mutableUsers = false;
-    allowNoPasswordLogin = true;
-  };
+  users.mutableUsers = false;
 }
--- a/modules/system/accounts/users/jimbo/default.nix
+++ b/modules/system/accounts/users/jimbo/default.nix
@ -19,7 +19,7 @@
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
      ];
      extraGroups = [
-        "admin"
+        "wheel"
        "audio"
        "video"
        "input"
--- a/modules/system/devices/bluetooth/default.nix
+++ b/modules/system/devices/bluetooth/default.nix
@ -10,6 +10,7 @@
    };

    systemd.tmpfiles.rules = [ "f /var/lib/systemd/linger/jimbo" ];
+
    environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
  };
 }
--- a/modules/system/devices/boot/lanzaboote/default.nix
+++ b/modules/system/devices/boot/lanzaboote/default.nix
@ -6,7 +6,6 @@
    enable = lib.mkOption {
      type = lib.types.bool;
      default = false;
-      description = "Enable Lanzaboote and force disable Systemd-boot";
    };
  };

--- a/modules/system/devices/networking/wireguard/client/default.nix
+++ b/modules/system/devices/networking/wireguard/client/default.nix
@ -3,7 +3,6 @@
  options.system.wireguard.client.enable = lib.mkOption {
    type = lib.types.bool;
    default = false;
-    description = "Enable the wireguard client";
  };

  config = lib.mkIf config.system.wireguard.client.enable {
--- a/modules/system/devices/networking/wireguard/server/default.nix
+++ b/modules/system/devices/networking/wireguard/server/default.nix
@ -3,7 +3,6 @@
  options.system.wireguard.server.enable = lib.mkOption {
    type = lib.types.bool;
    default = false;
-    description = "Enable the wireguard server";
  };

  config = lib.mkIf config.system.wireguard.server.enable {
--- a/modules/system/devices/networking/wireless/default.nix
+++ b/modules/system/devices/networking/wireless/default.nix
@ -3,7 +3,6 @@
  options.system.wireless.enable = lib.mkOption {
    type = lib.types.bool;
    default = true;
-    description = "Enable Wifi with iwd";
  };

  config = lib.mkIf config.system.wireless.enable {
--- a/modules/system/devices/video/nouveau/default.nix
+++ b/modules/system/devices/video/nouveau/default.nix
@ -3,7 +3,6 @@
  options.system.video.nouveau.enable = lib.mkOption {
    type = lib.types.bool;
    default = false;
-    description = "Enable the open-source Nouveau driver";
  };

  config = lib.mkIf config.system.video.nouveau.enable {
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@ -3,7 +3,6 @@
  options.system.video.nvidia.enable = lib.mkOption {
    type = lib.types.bool;
    default = false;
-    description = "Enable the proprietary Nvidia stack";
  };

  config = lib.mkIf config.system.video.nvidia.enable {
--- a/modules/system/options/default.nix
+++ b/modules/system/options/default.nix
@ -4,12 +4,10 @@ with lib; {
    desktop.enable = mkOption {
      type = types.bool;
      default = true;
-      description = "Enable desktop apps and services";
    };
    server.enable = mkOption {
      type = types.bool;
      default = false;
-      description = "Enable server services";
    };
  };
 }
--- a/modules/system/programs/default.nix
+++ b/modules/system/programs/default.nix
@ -7,8 +7,6 @@
    ./gaming
    ./git
    ./home-manager
-    ./nh
-    ./security
    ./shells
  ];
 }
--- a/modules/system/programs/git/gpg/default.nix
+++ b/modules/system/programs/git/gpg/default.nix
@ -1,9 +1,5 @@
 { pkgs, ... }:
 {
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
+  programs.gnupg.agent.enable = true;
  environment.systemPackages = with pkgs; [ git-crypt ];
 }
--- a/modules/system/programs/security/privilege/default.nix
+++ b/modules/system/programs/security/privilege/default.nix
@ -1,31 +0,0 @@
-{ ... }:
-{
-  security.sudo-rs = {
-    enable = true;
-    extraRules = [
-      { # Admin gets certain commands
-        groups = [ "admin" ];
-        commands = [
-          "/run/current-system/sw/bin/nix"
-          "/run/current-system/sw/bin/nh"
-          "/run/current-system/sw/bin/nixos-rebuild"
-          "/run/current-system/sw/bin/nixos-enter"
-          "/run/current-system/sw/bin/nix-collect-garbage"
-          "/run/current-system/sw/bin/nix-store"
-
-          "/run/current-system/sw/bin/systemctl"
-          "/run/current-system/sw/bin/pkill"
-
-          "/run/current-system/sw/bin/dd"
-          "/run/current-system/sw/bin/eject"
-          "/run/current-system/sw/bin/vgchange"
-
-          "/run/current-system/sw/bin/cp"
-          "/run/current-system/sw/bin/ls"
-          "/run/current-system/sw/bin/cat"
-          "/run/current-system/sw/bin/mount"
-        ];
-      }
-    ];
-  };
-}
--- a/modules/system/programs/security/privilege/default.nix~
+++ b/modules/system/programs/security/privilege/default.nix~
@ -1,31 +0,0 @@
-{ ... }:
-{
-  security.sudo-rs = {
-    enable = true;
-    extraRules = [
-      { # Admin gets certain commands
-        groups = [ "admin" ];
-        commands = [
-          "/run/current-system/sw/bin/nix"
-          "/run/current-system/sw/bin/nh"
-          "/run/current-system/sw/bin/nixos-rebuild"
-          "/run/current-system/sw/bin/nixos-enter"
-          "/run/current-system/sw/bin/nix-collect-garbage"
-          "/run/current-system/sw/bin/nix-store"
-
-          "/run/current-system/sw/bin/systemctl"
-          "/run/current-system/sw/bin/pkill"
-
-          "/run/current-system/sw/bin/dd"
-          "/run/current-system/sw/bin/eject"
-          "/run/current-system/sw/bin/vgchange"
-
-          "/run/current-system/sw/bin/cp"
-          "/run/current-system/sw/bin/ls"
-          "/run/current-system/sw/bin/cat"
-          "/run/current-system/sw/bin/mount"
-        ];
-      }
-    ];
-  };
-}
--- a/modules/system/services/general/displaymanager/uwsm/default.nix
+++ b/modules/system/services/general/displaymanager/uwsm/default.nix
--- a/modules/system/services/general/keyd/default.nix
+++ b/modules/system/services/general/keyd/default.nix
@ -33,7 +33,7 @@
          "9" = "f9";
          "0" = "f10";
          "-" = "f11";
-          #"=" = "f12";
+          # ?? "=" = "f12";
        };
      };
    };
--- a/modules/system/services/general/tlp/default.nix
+++ b/modules/system/services/general/tlp/default.nix
@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 {
  services.tlp.enable = true;
 }
--- a/modules/system/services/general/userborn/default.nix
+++ b/modules/system/services/general/userborn/default.nix
@ -1,5 +1,4 @@
 { ... }:
 {
-  # Enable this when 24.11 drops
-  #services.userborn.enable = true;
+  services.userborn.enable = true;
 }
--- a/modules/system/settings/default.nix
+++ b/modules/system/settings/default.nix
@ -2,9 +2,10 @@
 {
  imports = [
    ./documentation
-    ./fonts
+    ./font
    ./minimal
    ./nix
+    ./security
    ./timezone
  ];
 }
--- a/modules/system/settings/font/default.nix
+++ b/modules/system/settings/font/default.nix
@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u22n.psf.gz";
+}
--- a/modules/system/settings/fonts/default.nix
+++ b/modules/system/settings/fonts/default.nix
@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  console = {
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-u22n.psf.gz";
-    packages = with pkgs; [ terminus_font ];
-  };
-}
--- a/modules/system/settings/nix/default.nix
+++ b/modules/system/settings/nix/default.nix
@ -2,6 +2,7 @@
 {
  imports = [
    ./autoupgrade
+    ./gc
  ];

  nix.settings = {
--- a/modules/system/settings/nix/gc/default.nix
+++ b/modules/system/settings/nix/gc/default.nix
@ -0,0 +1,8 @@
+{ ... }:
+{
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 1w";
+  };
+}
--- a/modules/system/settings/security/apparmor/default.nix
+++ b/modules/system/settings/security/apparmor/default.nix
--- a/modules/system/settings/security/default.nix
+++ b/modules/system/settings/security/default.nix
--- a/modules/system/settings/security/polkit/default.nix
+++ b/modules/system/settings/security/polkit/default.nix
--- a/modules/system/settings/security/privilege/default.nix
+++ b/modules/system/settings/security/privilege/default.nix
@ -0,0 +1,16 @@
+{ ... }:
+{
+  security = {
+    sudo.enable = false;
+    doas = {
+      enable = true;
+      extraRules = [
+        { # Give wheel root access
+          groups = [ "wheel" ];
+          keepEnv = true;
+          persist = true;
+        }
+      ];
+    };
+  };
+}
--- a/modules/system/settings/security/rtprio/default.nix
+++ b/modules/system/settings/security/rtprio/default.nix