fix: keyring hopefully

home/default.nix

@@ -1,6 +1,7 @@
 # This file contains default settings used across different systems
 {
   imports = [
+    ./themes/catppuccin.nix
     ./graphical
     ./terminal
     ./desktop

hosts/brontes/default.nix

@@ -43,6 +43,7 @@ in
   };
 
   modules = {
+    fs.nfsEnable = true;
     system = {
       roles = {
         desktop.enable = true;
@@ -106,7 +107,6 @@ in
     fish.enable = true;
     firefox.enable = true;
     thunderbird.enable = true;
-    sway.enable = true;
     hyprland.enable = true;
   };
 
@@ -118,7 +118,6 @@ in
       isNormalUser = true;
       createHome = true;
       packages = with pkgs; [
-        prismlauncher
         orca-slicer
       ];
       extraGroups = [
@@ -138,18 +137,6 @@ in
     enableSSHSupport = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    fish
-    wireguard-tools
-    git
-    htop
-    eza
-    bat
-    nfs-utils
-  ];
-
-  services.rpcbind.enable = true; # necessary for nfs
-
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems;
 

hosts/brontes/home.nix

@@ -14,7 +14,6 @@ in
 
   home-manager.users.${username} = {
     imports = [
-      ../../home/themes/catppuccin.nix
       ../../home
     ];
 

hosts/marr/default.nix

@@ -2,13 +2,16 @@
 {
   pkgs,
   inputs,
+  config,
   ...
 }:
+let
+  inherit (config.modules.meta) username;
+in
 {
   imports = [
     ./hardware-configuration.nix
     ./home.nix
-    ./ny.nix
     ../../users/ny
   ];
 
@@ -61,8 +64,6 @@
     };
   };
 
-  hardware.graphics.enable = true;
-
   xdg = {
     portal.enable = true;
     mime.enable = true;
@@ -89,11 +90,12 @@
     firefox.enable = true;
     thunderbird.enable = true;
     hyprland.enable = true;
-    pulseview.enable = true;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
+      enableExtraSocket = true;
     };
+    seahorse.enable = true;
   };
 
   hardware.sane = {
@@ -122,9 +124,9 @@
       powerKey = "hibernate";
     };
 
-    thermald.enable = true;
+    #thermald.enable = true;
 
-    auto-cpufreq.enable = true;
+    #auto-cpufreq.enable = true;
 
     upower = {
       enable = true;
@@ -137,6 +139,19 @@
 
   users = {
     defaultUserShell = pkgs.fish;
+    users.${username} = {
+      isNormalUser = true;
+      createHome = true;
+      packages = with pkgs; [
+        simple-scan
+        beekeeper-studio
+      ];
+      extraGroups = [
+        "networkmanager"
+        "audio"
+        "libvirtd" # VM OPs
+      ];
+    };
   };
 
   environment.variables = {
@@ -159,13 +174,7 @@
 
   programs.virt-manager.enable = true;
 
-  programs.nix-ld.enable = true;
-
   environment.systemPackages = with pkgs; [
-    shared-mime-info
-    glib
-    dconf
-    xdg-utils
     brightnessctl
   ];
 

hosts/marr/home.nix

@@ -14,7 +14,6 @@ in
 
   home-manager.users.${username} = {
     imports = [
-      ../../home/themes/vanilla.nix
       ../../home
     ];
 

hosts/marr/ny.nix

@@ -1,71 +0,0 @@
-{
-  pkgs,
-  config,
-  inputs',
-  ...
-}:
-let
-  inherit (config.modules.meta) username;
-in
-{
-  config = {
-    users.users.${username} = {
-      packages =
-        [
-          inputs'.nur.packages.grayjay-desktop
-        ]
-        ++ (with pkgs; [
-          digikam
-          fragments
-          element-desktop
-          loupe
-          seahorse
-          gimp
-          thunderbird
-          keepassxc
-          protonmail-bridge-gui
-          varia
-          signal-desktop
-          onlyoffice-desktopeditors
-          picard
-          simple-scan
-          insomnia
-          beekeeper-studio
-
-          # Proprietary
-          postman
-          mongodb-compass
-          obsidian
-
-          # CLI tools
-          jhead
-          fdupes
-          exiftool
-          sshfs
-          lazygit
-          wl-clipboard
-
-          # custom
-          nysh
-          scripts.screenshot
-          scripts.nixedit
-          scripts.set-background
-          scripts.rpaste
-          scripts.nrun
-          scripts.nruni
-          scripts.genswitch
-          scripts.gentest
-          scripts.editsym
-          scripts.deployswitch
-          scripts.deploytest
-        ]);
-      isNormalUser = true;
-      createHome = true;
-      extraGroups = [
-        "networkmanager"
-        "audio"
-        "libvirtd"
-      ];
-    };
-  };
-}

modules/env.nix

@@ -1,6 +1,7 @@
 { pkgs, inputs, ... }:
 {
   environment.sessionVariables = {
+    SSH_AUTH_SOCK = "/run/user/\${UID}/keyring/ssh";
     MANROFFOPT = "-c";
     MANPAGER = "sh -c 'col -bx | ${pkgs.bat}/bin/bat -l man -p'";
     WALLPAPERS = "${inputs.wallpapers}";

options/system/roles/gaming.nix

@@ -12,6 +12,7 @@ in
 {
   options.modules.system.roles.gaming = {
     enable = mkEnableOption "gaming features";
+    minecraft.enable = mkEnableOption "minecraft";
   };
 
   config = mkIf cfg.enable {
@@ -32,6 +33,7 @@ in
     environment.systemPackages = with pkgs; [
       mangohud
       heroic
+      (mkIf cfg.minecraft.enable prismlauncher)
     ];
   };
 }

users/ny/default.nix

@@ -31,7 +31,6 @@ in
       element-desktop
       libreoffice
       loupe
-      seahorse
       pwvucontrol
       thunderbird
       keepassxc
@@ -39,6 +38,7 @@ in
       signal-desktop
       tagger
       kid3
+      hoppscotch
 
       # proprietary
       obsidian