move programs to home-manager modules

flake.lock

@@ -18,6 +18,24 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1785627969,
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -52,6 +70,27 @@
         "type": "github"
       }
     },
+    "nixcord": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-nixcord": "nixpkgs-nixcord",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1788082709,
+        "narHash": "sha256-NRJUB6pVNqLpX2apWi6fCz5j47ZePRI25f+9H0WYs6Y=",
+        "owner": "4evy",
+        "repo": "nixcord",
+        "rev": "208ae34f932f1ddda36553190169af1ba920481a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "4evy",
+        "repo": "nixcord",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1787209939,
@@ -68,7 +107,54 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-nixcord": {
+      "locked": {
+        "lastModified": 1786711500,
+        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1786711500,
+        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1788039129,
         "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
@@ -88,11 +174,46 @@
       "inputs": {
         "base16": "base16",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixcord": "nixcord",
+        "nixpkgs": "nixpkgs_3",
+        "tt-discord": "tt-discord",
         "tt-schemes": "tt-schemes",
         "tt-terminal": "tt-terminal"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixcord",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785945821,
+        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "tt-discord": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-a94aaomwiDeaoFKy3YXGVu6iMuIHtxXoFtGAse8tFz8=",
+        "type": "file",
+        "url": "https://git.lucy.rip/lucy/tinted-discord.git"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://git.lucy.rip/lucy/tinted-discord.git"
+      }
+    },
     "tt-schemes": {
       "flake": false,
       "locked": {

flake.nix

@@ -3,6 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     base16.url = "github:SenchoPens/base16.nix";
     home-manager.url = "github:nix-community/home-manager";
+    nixcord.url = "github:4evy/nixcord";
     tt-schemes = {
       url = "github:tinted-theming/schemes";
       flake = false;
@@ -11,6 +12,10 @@
       url = "github:tinted-theming/tinted-terminal";
       flake = false;
     };
+    tt-discord = {
+      url = "https://git.lucy.rip/lucy/tinted-discord.git";
+      flake = false;
+    };
 
   };
   outputs =
@@ -19,20 +24,15 @@
       nixpkgs,
       base16,
       home-manager,
+      nixcord,
       ...
     }@inputs:
     {
       nixosConfigurations.nerv = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; };
         modules = [
-          ./theme.nix
+          # set the theme
-          ({ pkgs, ... }: {
+          ./modules/themeing
-            config.theming.theme = "gruvbox-dark-hard";
-            config.theming.font = "Iosevka";
-            config.theming.fontPackage = pkgs.iosevka;
-          })
-          base16.nixosModule
-          ({ config, ... }: { scheme = "${config.theming.theme}"; })
           ./modules/hosts/nerv/configuration.nix
           home-manager.nixosModules.home-manager
           {
@@ -40,13 +40,10 @@
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
             imports = [
-              ./modules/hosts/nerv/home.nix
+              ./modules/themeing
-              ./modules/programs/emacs.nix
+              ./modules/programs
-              ./modules/programs/niri.nix
-              ./modules/programs/foot.nix
-              ./modules/programs/quickshell.nix
-              ./modules/programs/fuzzel.nix
             ];
+            home-manager.users.lucy = ./modules/hosts/nerv/home.nix;
           }
         ];
       };

modules/hosts/nerv/home.nix

@@ -7,13 +7,13 @@ let
   c = config.scheme.withHashtag;
 in
 {
-  home-manager.users.lucy = {
   home.packages = with pkgs; [
     nixd
     nixfmt
     clang
     kdePackages.qtdeclarative
   ];
+
   home.stateVersion = "26.05";
   home.pointerCursor = {
     enable = true;
@@ -80,5 +80,4 @@ in
     '';
   };
   dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
-  };
 }

modules/programs/default.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./foot.nix
+    ./niri.nix
+    ./emacs.nix
+    ./fuzzel.nix
+    ./quickshell.nix
+  ];
+}

modules/programs/emacs.nix

@@ -3,7 +3,7 @@
   ...
 }:
 {
-  home-manager.users.lucy.programs.emacs = {
+  programs.emacs = {
     enable = true;
     extraPackages =
       epkgs: with epkgs.melpaPackages; [

modules/programs/foot.nix

@@ -8,7 +8,7 @@ let
   c = config.scheme;
 in
 {
-  home-manager.users.lucy.programs.foot = {
+  programs.foot = {
     enable = true;
     settings = {
       main = {

modules/programs/fuzzel.nix

@@ -3,7 +3,7 @@ let
   c = config.scheme.withHashtag;
 in
 {
-  home-manager.users.lucy = {
+
   programs.fuzzel = {
     enable = true;
     settings = {
@@ -20,5 +20,5 @@ in
       };
     };
   };
-  };
+
 }

modules/programs/niri.nix

@@ -1,6 +1,6 @@
 { pkgs, config, ... }:
 {
-  home-manager.users.lucy.wayland.windowManager.niri = {
+  wayland.windowManager.niri = {
     enable = true;
     extraConfig = ''
             prefer-no-csd

modules/programs/nixcord.nix

@@ -0,0 +1,8 @@
+{ inputs, config, lib, ... }: {
+  imports = [ inputs.nixcord.homeModules.nixcord ];
+  programs.nixcord = {
+    enable = true;
+    discord.vencord.enable = true;
+    quickCss = (config.scheme inputs.tt-discord);
+  };
+}

modules/programs/quickshell.nix

@@ -4,7 +4,6 @@ let
 in
 {
 
-  home-manager.users.lucy = {
   programs.quickshell.enable = true;
   programs.quickshell.systemd.enable = true;
   xdg.configFile."quickshell/Colors.js" = {
@@ -32,5 +31,4 @@ in
     force = true;
   };
 
-  };
 }

modules/themeing/default.nix

@@ -1,4 +1,12 @@
-{ lib, inputs, ...}: {
+{
+  lib,
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+{
+  imports = [ inputs.base16.nixosModule ];
   options.theming.theme = lib.mkOption {
     type = lib.types.str;
     apply = name: "${inputs.tt-schemes}/base16/${name}.yaml";
@@ -9,4 +17,9 @@
   options.theming.fontPackage = lib.mkOption {
     type = lib.types.package;
   };
+
+  config.theming.theme = "catppuccin-mocha";
+  config.theming.font = "Iosevka";
+  config.theming.fontPackage = pkgs.iosevka;
+  config.scheme = config.theming.theme;
 }