188 current 2025-06-06 18:54:16 25.11.20250605.d3d2d80 6.15.1 *

home/base.nix

@@ -0,0 +1,183 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home = {
+    username = "chase";
+    homeDirectory = "/home/chase";
+    preferXdgDirectories = true;
+    file = {
+      "scripts" = {
+        source = config.lib.file.mkOutOfStoreSymlink ./scripts;
+        recursive = true;
+      };
+    };
+    sessionPath = [
+      "$HOME/scripts"
+    ];
+    shellAliases = {
+      gs = "git status";
+      "..." = "cd ../..";
+    };
+  };
+
+  xdg = {
+    enable = true;
+    userDirs.enable = true;
+    configFile = {
+      "emacs/early-init.el" = {
+        source = config.lib.file.mkOutOfStoreSymlink ./emacs/early-init.el;
+      };
+      "emacs/init.el" = {
+        source = config.lib.file.mkOutOfStoreSymlink ./emacs/init.el;
+      };
+    };
+  };
+
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+  };
+
+  programs.bash = {
+    enable = true;
+    enableCompletion = true;
+    bashrcExtra = ''
+      export SSH_AUTH_SOCK=/home/chase/.bitwarden-ssh-agent.sock
+    '';
+    historyIgnore = [
+      "ls"
+      "ls -a"
+      "ls -l"
+      "ls -la"
+      "cd"
+      "exit"
+    ];
+  };
+
+  programs.bat.enable = true;
+
+  programs.fastfetch = {
+    enable = true;
+    settings = {
+      logo = {
+        source = "nixos_small";
+      };
+      display = {
+        size = {
+          binaryPrefix = "si";
+        };
+        color = "blue";
+        separator = ": ";
+      };
+      modules = [
+        "title"
+        "separator"
+        "os"
+        "host"
+        "uptime"
+        "kernel"
+        "packages"
+        "lm"
+        "de"
+        "wm"
+        "shell"
+        "terminal"
+        "terminalfont"
+        {
+          key = "Display";
+          type = "display";
+        }
+        "cpu"
+        "gpu"
+        "memory"
+        "swap"
+        "disk"
+        "datetime"
+        "colors"
+        "break"
+        "player"
+        "media"
+      ];
+    };
+  };
+
+  programs.git = {
+    enable = true;
+    userName = "chase";
+    userEmail = "chase@cathoderaytube.net";
+    extraConfig = {
+      init.defaultBranch = "main";
+    };
+  };
+
+  programs.git-credential-oauth.enable = true;
+
+  programs.gpg = {
+    enable = true;
+    homedir = "${config.xdg.dataHome}/gnupg";
+  };
+
+  programs.htop.enable = true;
+
+  programs.ranger.enable = true;
+
+  programs.rmpc = {
+    enable = true;
+    config = ''
+      (
+        enable_config_hot_reload: true,
+         )
+    '';
+  };
+
+  # programs.senpai.enable = true;
+
+  # programs.sm64ex.enable = true;
+
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+    settings = {
+      line_break = {
+        disabled = true;
+      };
+      username = {
+        style_user = "bold blue";
+        format = "[$user]($style)@";
+        show_always = true;
+      };
+      hostname = {
+        style = "bold cyan";
+        format = "[$ssh_symbol$hostname]($style) ";
+        ssh_only = false;
+      };
+      directory = {
+        style = "bold green";
+      };
+    };
+  };
+
+  programs.texlive.enable = true;
+
+  programs.yazi = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+
+  programs.yt-dlp = {
+    enable = true;
+    settings = {
+      embed-thumbnail = true;
+    };
+  };
+
+  home.packages = with pkgs; [
+    ffmpeg
+    fortune
+    imagemagick
+    lolcat
+    nerd-fonts.blex-mono
+  ];
+}

home/desktop.nix

@@ -4,115 +4,14 @@
   ...
 }: {
   imports = [
-    ./plasma.nix
+    ./base.nix
   ];
 
-  home = {
-    username = "chase";
-    homeDirectory = "/home/chase";
-    preferXdgDirectories = true;
-    stateVersion = "24.11";
-    file = {
-      "scripts" = {
-        source = config.lib.file.mkOutOfStoreSymlink ./scripts;
-        recursive = true;
-      };
-    };
-    sessionPath = [
-      "$HOME/scripts"
-    ];
-    shellAliases = {
-      gs = "git status";
-      "..." = "cd ../..";
-    };
-  };
-
-  xdg = {
-    enable = true;
-    userDirs.enable = true;
-    configFile = {
-      "emacs/early-init.el" = {
-        source = config.lib.file.mkOutOfStoreSymlink ./emacs/early-init.el;
-      };
-      "emacs/init.el" = {
-        source = config.lib.file.mkOutOfStoreSymlink ./emacs/init.el;
-      };
-    };
-  };
-
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-  };
-
-  programs.bash = {
-    enable = true;
-    enableCompletion = true;
-    bashrcExtra = ''
-      export SSH_AUTH_SOCK=/home/chase/.bitwarden-ssh-agent.sock
-    '';
-    historyIgnore = [
-      "ls"
-      "ls -a"
-      "ls -l"
-      "ls -la"
-      "cd"
-      "exit"
-    ];
-  };
-
-  programs.bat.enable = true;
-
   programs.emacs = {
     enable = true;
     package = pkgs.emacs-pgtk;
   };
 
-  programs.fastfetch = {
-    enable = true;
-    settings = {
-      logo = {
-        source = "nixos_small";
-      };
-      display = {
-        size = {
-          binaryPrefix = "si";
-        };
-        color = "blue";
-        separator = ": ";
-      };
-      modules = [
-        "title"
-        "separator"
-        "os"
-        "host"
-        "uptime"
-        "kernel"
-        "packages"
-        "lm"
-        "de"
-        "wm"
-        "shell"
-        "terminal"
-        "terminalfont"
-        {
-          key = "Display";
-          type = "display";
-        }
-        "cpu"
-        "gpu"
-        "memory"
-        "swap"
-        "disk"
-        "datetime"
-        "colors"
-        "break"
-        "player"
-        "media"
-      ];
-    };
-  };
-
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [pkgs.firefoxpwa];
@@ -210,24 +109,6 @@
     };
   };
 
-  programs.git = {
-    enable = true;
-    userName = "chase";
-    userEmail = "chase@cathoderaytube.net";
-    extraConfig = {
-      init.defaultBranch = "main";
-    };
-  };
-
-  programs.git-credential-oauth.enable = true;
-
-  programs.gpg = {
-    enable = true;
-    homedir = "${config.xdg.dataHome}/gnupg";
-  };
-
-  programs.htop.enable = true;
-
   programs.kitty = {
     enable = true;
     enableGitIntegration = true;
@@ -251,87 +132,21 @@
 
   programs.obs-studio.enable = true;
 
-  programs.ranger.enable = true;
-
-  programs.rmpc = {
-    enable = true;
-    config = ''
-      (
-        enable_config_hot_reload: true,
-         )
-    '';
-  };
-
-  # programs.senpai.enable = true;
-
-  # programs.sm64ex.enable = true;
-
-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    settings = {
-      line_break = {
-        disabled = true;
-      };
-      username = {
-        style_user = "bold blue";
-        format = "[$user]($style)@";
-        show_always = true;
-      };
-      hostname = {
-        style = "bold cyan";
-        format = "[$ssh_symbol$hostname]($style) ";
-        ssh_only = false;
-      };
-      directory = {
-        style = "bold green";
-      };
-    };
-  };
-
-  programs.texlive.enable = true;
-
-  programs.waybar = {
-    enable = true;
-    systemd = {
-      enable = true;
-      target = "hyprland-session.target";
-    };
-  };
-
-  programs.yazi = {
-    enable = true;
-    enableBashIntegration = true;
-  };
-
-  programs.yt-dlp = {
-    enable = true;
-    settings = {
-      embed-thumbnail = true;
-    };
-  };
-
   home.packages = with pkgs; [
     anki-bin
     audacity
-    ffmpeg
-    fortune
     gimp
     ibm-plex
-    imagemagick
     kdePackages.kdenlive
     libnotify
     libreoffice
     logiops
-    lolcat
-    nerd-fonts.blex-mono
     picard
     protonmail-bridge
     thunderbird
     vcv-rack
     runelite
   ];
-
   services.arrpc.enable = true;
 
   services.emacs = {
@@ -347,18 +162,6 @@
     defaultEditor = true;
   };
 
-  services.hyprpolkitagent.enable = true;
-
-  services.hyprsunset.enable = true;
-
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      preload = ["/home/chase/nixos-config/home/wallpaper.jpg"];
-      wallpaper = ["/home/chase/nixos-config/home/wallpaper.jpg"];
-    };
-  };
-
   services.mako.enable = true;
 
   services.mpd = {
@@ -388,11 +191,4 @@
     enable = true;
     mpd.useLocal = true;
   };
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    package = null;
-    portalPackage = null;
-    systemd.enable = true;
-  };
 }

home/hypr.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = true;
+      target = "hyprland-session.target";
+    };
+  };
+
+  services.hyprpolkitagent.enable = true;
+
+  services.hyprsunset.enable = true;
+
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      preload = ["/home/chase/nixos-config/home/wallpaper.jpg"];
+      wallpaper = ["/home/chase/nixos-config/home/wallpaper.jpg"];
+    };
+  };
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+    package = null;
+    portalPackage = null;
+    systemd.enable = true;
+  };
+}