nix

2026-02-06 08:48:46 -06:00
parent a68c91264f
commit bf48d8fcf0
10 changed files with 71 additions and 32 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -12,7 +12,7 @@ keys:
  - &deck age1c8qw59ffcq9l77gfmtyc3djtvt3md0u6dwhrjcgsm98ntyf72ufqugj7cg
  - &steamdeck age1er5qucsc2mugrzrr7n3xhzv7kemkrqrw4m84r544fkk7nkg5g5eswxkqj0
  - &matt_macbook-pro age19daqsncuzeh3j6cwk8uxp6yfj8h0qtz02jxlwwy4v8j0mfgznsvq30440g
-  - &macbook-pro age19w4zafpwnq9yhzuf8r5te2yhq7xlqj76rcgzcz935hllyrz4yvws4jn6ca
+  - &macbook-pro age1t7378n8kmd3f32fkye2gw3jj6qswv3exjdx0dq8kl0xra3tmcdnsvddq3u
  - &nuc age102el4snus37dj807rwvsmlvwu2sg2d8rw3vfmtntgczfkz04l9nshetcq0
  - &admin_nuc age1yn82e39pxt0d0pgny34ux4lkge4ff7wxvsye8ragvwngehemt4ps27phyw
  - &matt_allyx age1n5frpwgvps7c2348ynu9g7g47kqar4srdplw5kkcyn4x80eqzetqw3ej2m
--- a/flake.lock
+++ b/flake.lock
@@ -205,14 +205,14 @@
        "type": "github"
      }
    },
-    "dotfiles": {
+    "end4-dotfiles": {
      "flake": false,
      "locked": {
-        "lastModified": 1769126799,
-        "narHash": "sha256-v/VwDphmB+pdp51d65feDAXYLxU3juUIOIvVVT43oP4=",
+        "lastModified": 1770104062,
+        "narHash": "sha256-0+6LXC3iCzmXUvUxKNygP8wGB2BPVACg8Bd56ITlVck=",
        "ref": "refs/heads/main",
-        "rev": "1b4c439c3e8286809747becfc59461b484345bfa",
-        "revCount": 5856,
+        "rev": "640a1477215903ec5bca7901cc44faf8097ef8cb",
+        "revCount": 5877,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/end-4/dots-hyprland"
@@ -666,7 +666,9 @@
    },
    "illogical-flake": {
      "inputs": {
-        "dotfiles": "dotfiles",
+        "dotfiles": [
+          "end4-dotfiles"
+        ],
        "nixpkgs": [
          "nixpkgs"
        ],
@@ -1401,6 +1403,7 @@
        "cosmic": "cosmic",
        "darwin": "darwin",
        "disko": "disko",
+        "end4-dotfiles": "end4-dotfiles",
        "home-manager": "home-manager",
        "home-manager-stable": "home-manager-stable",
        "home-manager-unstable": "home-manager-unstable",
--- a/flake.nix
+++ b/flake.nix
@@ -112,9 +112,14 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    end4-dotfiles = {
+      url = "git+https://github.com/end-4/dots-hyprland?submodules=1";
+      flake = false;
+    };
    illogical-flake = {
      url = "github:soymou/illogical-flake";
      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.dotfiles.follows = "end4-dotfiles";
    };
  };

--- a/homes/x86_64-linux/matt@matt-nixos/default.nix
+++ b/homes/x86_64-linux/matt@matt-nixos/default.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
  lib,
  pkgs,
  namespace,
@@ -171,6 +172,7 @@ in
      compose2nix
      distrobox
      heroic
+      home-manager
      omnissa-horizon-client
      jq
      lzip
@@ -180,7 +182,6 @@ in
      prismlauncher
      protontricks
      protonvpn-gui
-      python3
      runelite
      smile
      via
@@ -194,6 +195,38 @@ in
    ]);

  specialisation = {
+    "end4".configuration = 
+      let
+        dotfiles = inputs.end4-dotfiles;
+      in {
+      programs = {
+        illogical-impulse = {
+          enable = true;
+        
+          dotfiles = {
+            fish = lib.mkForce disabled;
+            starship = lib.mkForce disabled;
+          };
+          
+          hyprland.plugins = [
+            pkgs.hyprlandPlugins.hyprbars
+            pkgs.hyprlandPlugins.hyprexpo
+          ];
+        };
+      };
+      stylix.targets.qt = lib.mkForce disabled;
+      ${namespace} = {
+        programs = {
+          mako = lib.mkForce disabled;
+          nwg-dock = lib.mkForce disabled;
+          nwg-drawer = lib.mkForce disabled;
+          nwg-panel = lib.mkForce disabled;
+          waybar = lib.mkForce disabled;
+          wlogout = lib.mkForce disabled;
+          wofi = lib.mkForce disabled;
+        };
+      };
+    };
    "cosmic".configuration = {
      ${namespace} = {
        programs = {
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -58,6 +58,8 @@ in
      };

      gnome.gnome-keyring.enable = true;
+      geoclue2.enable = true;
+      upower.enable = true;

      dbus.enable = true;
      ddccontrol.enable = false;
--- a/modules/nixos/fonts/default.nix
+++ b/modules/nixos/fonts/default.nix
@@ -2,10 +2,12 @@
 {
  fonts.packages = with pkgs; [
    font-awesome
+    pkgs.nerd-fonts.ubuntu
    noto-fonts
    noto-fonts-color-emoji
    meslo-lgs-nf
    pkgs.nerd-fonts.jetbrains-mono
+    rubik
  ];
  # ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); # ALL fonts

--- a/modules/nixos/home/default.nix
+++ b/modules/nixos/home/default.nix
@@ -66,6 +66,7 @@ in
          nix-plist-manager.homeManagerModules.default
          nix-index-database.homeModules.nix-index
          stylix.homeModules.stylix
+          illogical-flake.homeManagerModules.default
          # Add any other external HM modules here
        ]
        ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ])
--- a/overlays/ccache/default.nix
+++ b/overlays/ccache/default.nix
@@ -1,5 +1,5 @@
 { ... }:
-_final: _super: {
+final: super: {
  # ${namespace} = super.${namespace} // {
  #   linuxPackages_rpi5 = super.linuxPackagesFor (
  #     super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; }
@@ -116,13 +116,6 @@ _final: _super: {
  #   qtwebengine = super.stable.kdePackages.qtwebengine; # .override { stdenv = super.ccacheStdenv; };
  # };

-  # # python3Packages = super.python3Packages // {
-  # #   torch = super.python3Packages.torch.override {
-  # #     stdenv = super.ccacheStdenv;
-  # #     inherit gpuTargets;
-  # #   };
-  # # };
-
  # # piper-tts = super.piper-tts.overridePythonAttrs (oldAttrs: {
  # #   pythonCatchConflictsPhase = null;
  # # });
--- a/systems/aarch64-linux/macbook-pro-nixos/default.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix
@@ -34,6 +34,7 @@
    };
    user = {
      name = "matt";
+      hashedPassword = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
      extraGroups = [
        "scanner"
        "lp"
--- a/systems/x86_64-linux/matt-nixos/default.nix
+++ b/systems/x86_64-linux/matt-nixos/default.nix
@@ -87,20 +87,19 @@
  #   capabilities = "cap_net_admin+p";
  # };

-  #  specialisation = {
-  #   "cosmic" = {
-  #      enable = false;
-  #      configuration = {
-  #        ${namespace} = {
-  #          desktop = {
-  #            cosmic.enable = lib.mkForce true;
-  #            hyprland = {
-  #              enable = lib.mkForce false;
-  #            };
-  #           gnome.enable = lib.mkForce false;
-  #         };
-  #        };
-  #      };
-  #    };
-  #  };
+   specialisation = {
+    "cosmic" = {
+       configuration = {
+         ${namespace} = {
+           desktop = {
+             cosmic.enable = lib.mkForce true;
+             hyprland = {
+               enable = lib.mkForce false;
+             };
+            gnome.enable = lib.mkForce false;
+          };
+         };
+       };
+     };
+   };
 }