.config/hypr/hyprland.conf

@@ -11,14 +11,8 @@
 
 # env = AQ_DRM_DEVICES,/dev/dri/card1
 #env = AQ_NO_MODIFIERS,1
-#monitor=,preferred,auto,1
+monitor=,preferred,auto,1
-
+monitor=eDP-1,1920x1200@60.0,3564x0,1.0,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.8,bitdepth,10
-
-#monitor=eDP-1,1920x1200@60.0,3564x0,1.0,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.8,bitdepth,10
-# Generated by nwg-displays on 2026-02-17 at 11:54:19. Do not edit manually.
-
-#monitor=eDP-1,1920x1200@60.0,3564x0,1.0
-#monitor=HDMI-A-1,2560x1440@144.0,1004x0,1.0
 
 # env = LIBVA_DRIVER_NAME,nvidia
 # env = XDG_SESSION_TYPE,wayland
@@ -35,10 +29,7 @@ cursor {
 
 source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/workspaces.conf
-#source = ~/.config/hypr/hyprland.colors.conf
+source = ~/.config/hypr/hyprland.colors.conf
-
-monitor=desc:ASUSTek COMPUTER INC VG27AQL5A T7LMQS022027,2560x1440@144.0,0x0,1.0,bitdepth,10
-monitor=eDP-1,1920x1200@60.0,2560x0,1.0,bitdepth,10,cm,srgb
 
 debug:disable_logs = false
 
@@ -87,7 +78,7 @@ exec-once = swww-daemon
 # "$(cat ~/.local/state/quickshell/user/generated/wallpaper/path.txt)"
 exec-once = sleep 0.5; swww img ~/.config/hypr/wallpapers/sunflowers.jpg --transition-step 100 --transition-fps 120 --transition-type grow --transition-angle 30 --transition-duration 1
 # exec-once=waybar
-# exec-once=quickshell -c ii
+exec-once=quickshell -c ii
 exec-once=blueman-applet
 # exec-once=dunst
 exec-once=udev-block-notify
@@ -102,12 +93,10 @@ exec-once = wl-paste --type text --watch cliphist store
 exec-once = wl-paste --type image --watch cliphist store
 exec-once = fcitx5
 exec-once = easyeffects --gapplication-service
-exec-once = dms run
-
 
 #$swaylock = swaylock --screenshots --clock --indicator --effect-blur 6x6 --fade-in 0.2 --ring-color 4e9dc2 --key-hl-color 71b0ce
 $swaylock = hyprlock
-# exec-once=hypridle
+exec-once=hypridle
 
 # exec-once=swayidle -w timeout 300 '$swaylock --grace 2' before-sleep '$swaylock'
 # Needs repackaging...
@@ -296,15 +285,6 @@ layerrule = blur on, match:namespace quickshell:sidebarRight
 layerrule = blur_popups on, match:namespace quickshell:sidebarRight
 layerrule = ignore_alpha .2, match:namespace quickshell:sidebarRight
 
-layerrule {
-    name="blur dms"
-    match:namespace = dms:(color-picker|clipboard|spotlight|settings)
-    blur = on
-    ignore_alpha = 0
-}
-
-# layerrule = noanim, match:namespace ^(dms)$
-
 blurls=gtk-layer-shell
 blurls=lockscreen
 blurls = rofi
@@ -312,20 +292,17 @@ blurls = rofi
 $dir =  ~/.config
 #! quickshell
 bindr = SUPER+ALT, R, exec, pkill rofi || $dir/rofi/bin/launcher
-# bind = SUPER, r, global, quickshell:overviewSearchToggle
+bind = SUPER, r, global, quickshell:overviewSearchToggle
-# bind = SUPER, r, exec, dms ipc call spotlight toggle
 bind = SUPER+ALT, P, exec, pkill rofi || $dir/rofi/bin/powermenu
-# bind = SUPER, p, exec, dms ipc call powermenu open
+bind = SUPER, p, global, quickshell:sessionToggle
-# bind = SUPER, tab, exec, dms ipc call hypr toggleOverview
+bind = SUPER, m, global, quickshell:mediaControlsToggle
-# bind = SUPER, p, global, quickshell:sessionToggle
+bind = SUPER, grave, global, quickshell:sidebarLeftToggle
-# bind = SUPER, m, global, quickshell:mediaControlsToggle
+bind = SUPER, b, global, quickshell:sidebarRightToggle
-# bind = SUPER, grave, global, quickshell:sidebarLeftToggle
+bind = SUPER, slash, global, quickshell:cheatsheetToggle
-# bind = SUPER, b, global, quickshell:sidebarRightToggle
+bind = SUPER, tab, global, quickshell:overviewToggle
-# bind = SUPER, slash, global, quickshell:cheatsheetToggle
+bindrt = SUPER, SUPER_L, global, quickshell:workspaceNumber
-# bind = SUPER, tab, global, quickshell:overviewToggle
+bindd = Super, h, Clipboard history >> clipboard, global, quickshell:overviewClipboardToggle # Clipboard history >> clipboard
-# bindrt = SUPER, SUPER_L, global, quickshell:workspaceNumber
+bindd = Super, Period, Emoji >> clipboard, global, quickshell:overviewEmojiToggle # Emoji >> clipboard
-# bindd = Super, h, Clipboard history >> clipboard, global, quickshell:overviewClipboardToggle # Clipboard history >> clipboard
-# bindd = Super, Period, Emoji >> clipboard, global, quickshell:overviewEmojiToggle # Emoji >> clipboard
 
 $mainMod = SUPER
 
@@ -412,7 +389,7 @@ bind = ,Print,exec,hyprshot --clipboard-only --mode active --mode output
 # bind = SUPER+SHIFT,S,exec,spectacle --copy-image --region --background # no gui
 # bind = SUPER+SHIFT,S,exec,grim -g "$(slurp)" - | wl-copy
 bind = SUPER+SHIFT,S,exec,hyprshot --freeze --clipboard-only --mode region
-# bind = SUPER, L,exec,$swaylock
+bind = SUPER, L,exec,$swaylock
 
 #! move windows to workspaces
 bind = $mainMod SHIFT, 1, movetoworkspace, 1
@@ -480,8 +457,3 @@ decoration {
 #windowrule = monitor 1,title:flameshot
 #windowrule = move 0 0,title:flameshot
 #windowrule = noanim,title:flameshot
-
-#enable once dms fixes config; uses old hyprland syntax
-source = ~/.config/hypr/dms/colors.conf
-source = ~/.config/hypr/dms/binds.conf
-source = ~/.config/hypr/dms/layout.conf

configuration.nix

@@ -1,22 +1,16 @@
+
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{
+{ config, pkgs, /*hyprland,*/ options, /*hyprland-plugins, */nixpkgs-unstable, lib, nixos-hardware, zen-browser/*, kwin-effects-forceblur*/, ... }:
-  config,
-  pkgs,
-  options,
-  nixpkgs-unstable,
-  lib,
-  dms,
-  ...
-}:
 let
   unstable-pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; #import nixpkgs-unstable.nixosModules.readOnlyPkgs {};
   # unstable-pkgs = hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
 in
 {
-  imports = [
+  imports =
+    [
 #      nixos-hardware.nixosModules.lenovo-legion-16ach6h-hybrid # this is borked in latest update for some reason, edid doesn't build
       # nixos-hardware.nixosModules.common-cpu-amd
       # nixos-hardware.nixosModules.common-cpu-amd-pstate
@@ -26,7 +20,6 @@ in
       # nixos-hardware.nixosModules.common-pc-laptop
       # nixos-hardware.nixosModules.common-pc-laptop-ssd
       ./hardware-configuration.nix
-    dms.nixosModules.greeter
       # /etc/nixos/cachix.nix
     ];
  # nyx.low-power.enable = true;
@@ -47,6 +40,7 @@ in
     "electron-33.4.11"
   ];
 
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.supportedFilesystems = [ "ntfs" ];
@@ -82,10 +76,7 @@ in
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
   # networking.nameservers = ["1.1.1.1"];
-  services.dnsmasq.settings.server = [
+  services.dnsmasq.settings.server = [ "100.100.100.100" "127.0.0.1#5053" ];
-    "100.100.100.100"
-    "127.0.0.1#5053"
-  ];
 
   networking.networkmanager.enable = true;
   networking.networkmanager.plugins = with pkgs; [networkmanager-openconnect];
@@ -157,14 +148,12 @@ in
     alsa.support32Bit = true;
     pulse.enable = true;
   };
-  security.pam.loginLimits = [
+  security.pam.loginLimits = [{
-    {
     domain = "*";
     type = "soft";
     item = "nofile";
     value = "64000";
-    }
+  }];
-  ];
   services.geoclue2.enable = true;
   services.localtimed.enable = true;
   services.lorri.enable = true;
@@ -182,32 +171,14 @@ in
 
   users.users.dan = {
     isNormalUser = true;
-    description = "Dan";
+    description = "John";
-    extraGroups = [
+    extraGroups = [ "networkmanager" "wheel" "docker" "fuse" "video" "wireshark" "gamemode" "scanner" "lp" "kvm" "adbusers" "dialout"];
-      "i2c"
-      "networkmanager"
-      "wheel"
-      "docker"
-      "fuse"
-      "video"
-      "wireshark"
-      "gamemode"
-      "scanner"
-      "lp"
-      "kvm"
-      "adbusers"
-      "dialout"
-    ];
     shell = pkgs.fish;
     packages = with pkgs; [
       kdePackages.kate
     ];
   };
-  nix.settings.trusted-users = [
+  nix.settings.trusted-users = [ "root" "@wheel" "dan" ];
-    "root"
-    "@wheel"
-    "dan"
-  ];
 
   # Other defaults are set in home.nix
   # environment.sessionVariables.DEFAULT_BROWSER = "firefox";
@@ -242,16 +213,9 @@ in
     # package = unstable-pkgs.hyprland;
   };
   # End comment out
-  #
-  programs.dank-material-shell.greeter = {
-    enable = true;
-    compositor.name = "hyprland"; # Or "hyprland" or "sway"
-    configHome = "/home/dan";
-  };
   
   #xdg.configFile."menus/applications.menu".text = builtins.readFile ./applications.menu;
-  environment.etc."/xdg/menus/plasma-applications.menu".text =
+  environment.etc."/xdg/menus/plasma-applications.menu".text = builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
-    builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
 
   # programs.hyprland.enable = true;
   programs.hyprlock.enable = true;
@@ -261,15 +225,12 @@ in
   # Fix dynamic binaries from outside of nix
   programs.nix-ld = {
     enable = true;
-    libraries =
+    libraries = options.programs.nix-ld.libraries.default ++ (with pkgs; [
-      options.programs.nix-ld.libraries.default
-      ++ (with pkgs; [
       libdrm
       mesa
       libxkbcommon
       openssl
-        libGL
+      libGL libva
-        libva
       libelf
     ]);
   };
@@ -361,6 +322,7 @@ in
 
 #    lenovo-legion
 
+
     # required for quickshell config; needs to be here for them to be included in import/plugin path
     kdePackages.qt5compat
     kdePackages.qtdeclarative
@@ -376,8 +338,7 @@ in
     libsForQt5.kirigami2
     kdePackages.syntax-highlighting
 
-    (python313.withPackages (
+    (python313.withPackages(ps: with ps; [
-      ps: with ps; [
       build
       pillow
       cffi
@@ -397,12 +358,10 @@ in
       wheel
 
       pwntools
-      ]
+    ]))
-    ))
   ];
 
-  environment.variables =
+  environment.variables =  let
-    let
         qtVersions = with pkgs; [
           qt5
           qt6
@@ -410,9 +369,7 @@ in
       in
       {
         QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;
-      QML2_IMPORT_PATH =
+        QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions ++ (with unstable-pkgs; [
-        map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions
-        ++ (with unstable-pkgs; [
           "${quickshell}/lib/qt-6/qml/"
         ]);
       };
@@ -460,14 +417,12 @@ in
   services.cpupower-gui.enable = true;
   services.upower.enable = true;
   services.power-profiles-daemon.enable = false;
-  # services.tlp = {
+  services.tlp = {
-  # enable = true;
+    enable = true;
    # USB_DENYLIST = "04d9:a0b8";
-  # };
+  };
-  powerManagement.enable = true;
+  # powerManagement.powertop.enable = true;
-  powerManagement.powertop.enable = true;
+  # powerManagement.cpuFreqGovernor = "powersave";
-  powerManagement.cpuFreqGovernor = "schedutil";
-  services.thermald.enable = true;
 
   security.polkit.enable = true;
 
@@ -492,8 +447,7 @@ in
     5353 # Google cast discovery
     42000 # warpinator
     42001 # warpinator 
-    67
+    67 68 # dhcp
-    68 # dhcp
     1716 # kdeconnect
   ];
   # Or disable the firewall altogether.
@@ -507,6 +461,7 @@ in
   services.lldpd.enable = true;
   systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
 
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -515,11 +470,9 @@ in
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "25.11"; # Did you read the comment?
 
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
 
   # /etc/hosts :)
-  networking.extraHosts = "";
+  networking.extraHosts = ''
+  '';
 }

fast-copy.sh

@@ -1,3 +1,4 @@
+
 echo "Copying configurations"
 cp .config/* ~/.config/ -r
 echo fixing quickshell copy

flake.lock

@@ -78,26 +78,6 @@
         "type": "github"
       }
     },
-    "danksearch": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1771177088,
-        "narHash": "sha256-n6e4e0iHNwtdGOlkJlDR9lbFhYalLMuqeQ3jDfp1CaA=",
-        "owner": "AvengeMedia",
-        "repo": "danksearch",
-        "rev": "3b3b79514acf349c166ae53db2225470a28be9e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "danksearch",
-        "type": "github"
-      }
-    },
     "determinate": {
       "inputs": {
         "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
@@ -155,28 +135,6 @@
         "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux"
       }
     },
-    "dms": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "quickshell": "quickshell"
-      },
-      "locked": {
-        "lastModified": 1771347696,
-        "narHash": "sha256-O9NIJqfuSjwY//7OyFH3FqxRHe5M0vmmsXcryOi/bAE=",
-        "owner": "AvengeMedia",
-        "repo": "DankMaterialShell",
-        "rev": "dd4c41a6b2d90f3238f543d1cc54f5f062d685a6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "ref": "stable",
-        "repo": "DankMaterialShell",
-        "type": "github"
-      }
-    },
     "dolphin-overlay": {
       "inputs": {
         "nixpkgs": "nixpkgs_5"
@@ -369,11 +327,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1771325388,
+        "lastModified": 1770919951,
-        "narHash": "sha256-rSSr7h/qbRwxEtcIUe3UlSvbQxPJ4eYI9J84ewGz60o=",
+        "narHash": "sha256-f8e4IoLZY0xh/eFt99nKizyQxUKr0atmc21lGLkp9io=",
         "owner": "schembriaiden",
         "repo": "helium-browser-nix-flake",
-        "rev": "99d0cecff6778a71be1f2e325e0e645fd749a397",
+        "rev": "9a6ce68bcf28366de6240ed9e37786d476c203fe",
         "type": "github"
       },
       "original": {
@@ -800,64 +758,6 @@
         "type": "github"
       }
     },
-    "niri": {
-      "inputs": {
-        "niri-stable": "niri-stable",
-        "niri-unstable": "niri-unstable",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable",
-        "xwayland-satellite-stable": "xwayland-satellite-stable",
-        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
-      },
-      "locked": {
-        "lastModified": 1771308899,
-        "narHash": "sha256-kb/4oSHB261GOLhVGgrzTOqo/ImeCi/WS25q2ujtHGc=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "f3e98ba073bd7e2717a07d622f9b737c461a97b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "type": "github"
-      }
-    },
-    "niri-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1756556321,
-        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "ref": "v25.08",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
-    "niri-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1771305475,
-        "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
     "nix": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -885,11 +785,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1771295873,
+        "lastModified": 1771123156,
-        "narHash": "sha256-BbzfAGRrEgvSn5p1k8G3FtBNte50JQ+YiBmy/zC/3NE=",
+        "narHash": "sha256-Px1IFFTw3zdP8RNram2g41EvUTjIZRDLCgZyXgpBty0=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "d39046b43da919faf235170f9cb321712468f907",
+        "rev": "0c4bf3ac4eaf5b693e5d7ae75f3caba8fcf15d8f",
         "type": "github"
       },
       "original": {
@@ -1017,22 +917,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1771208521,
-        "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1771008912,
@@ -1195,40 +1079,15 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "dms",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1766725085,
-        "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=",
-        "ref": "refs/heads/master",
-        "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
-        "revCount": 715,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      },
-      "original": {
-        "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      }
-    },
     "root": {
       "inputs": {
         "colmena": "colmena",
         "copyparty": "copyparty",
-        "danksearch": "danksearch",
         "determinate": "determinate",
-        "dms": "dms",
         "dolphin-overlay": "dolphin-overlay",
         "helium": "helium",
         "home-manager": "home-manager",
         "hyprland-plugins": "hyprland-plugins",
-        "niri": "niri",
         "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
@@ -1348,50 +1207,17 @@
         "type": "github"
       }
     },
-    "xwayland-satellite-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1755491097,
-        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "ref": "v0.7",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
-    },
-    "xwayland-satellite-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1771195969,
-        "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1771303996,
+        "lastModified": 1771269662,
-        "narHash": "sha256-cwf75uTx8cGJCP+nohi7iVTE+lmfevBxNgirkMLkuEY=",
+        "narHash": "sha256-hOElvRG8mOCmYc9vhZOqnccqIJRoD6VR6vXOOj0attk=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "a7659a805bda3ae8e4861572d8dc0f1d29f3fc3c",
+        "rev": "9294a1e30995dc950e2632296a74baae25252473",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,17 +1,5 @@
 {
   inputs = {
-    dms = {
-      url = "github:AvengeMedia/DankMaterialShell/stable";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    danksearch = {
-      url = "github:AvengeMedia/danksearch";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    niri = {
-      url = "github:sodiboo/niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     #nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     helium = {
 	url = "github:schembriaiden/helium-browser-nix-flake";
@@ -49,23 +37,7 @@
     copyparty.url = "github:9001/copyparty";
   };
 
-  outputs =
+  outputs = { nixpkgs, determinate, colmena, helium, zen-browser, dolphin-overlay, hyprland-plugins, home-manager, nixpkgs-unstable, nix-gaming, nix-index-database, ... }@attrs: {
-    {
-      nixpkgs,
-      determinate,
-      colmena,
-      helium,
-      zen-browser,
-      dolphin-overlay,
-      hyprland-plugins,
-      home-manager,
-      nixpkgs-unstable,
-      nix-gaming,
-      nix-index-database,
-      dms,
-      ...
-    }@attrs:
-    {
     nixosConfigurations.aura = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = attrs;
@@ -75,24 +47,23 @@
             # dolphin-overlay.overlays.default
             (_: prev: {
               tailscale = prev.tailscale.overrideAttrs (old: {
-                  checkFlags = builtins.map (
+                checkFlags =
+                  builtins.map (
                     flag:
-                    if prev.lib.hasPrefix "-skip=" flag then
+                      if prev.lib.hasPrefix "-skip=" flag
-                      flag + "|^TestGetList$|^TestIgnoreLocallyBoundPorts$|^TestPoller$"
+                      then flag + "|^TestGetList$|^TestIgnoreLocallyBoundPorts$|^TestPoller$"
-                    else
+                      else flag
-                      flag
+                  )
-                  ) old.checkFlags;
+                  old.checkFlags;
               });
             })
           ];
         }
         determinate.nixosModules.default
-          home-manager.nixosModules.home-manager
+        home-manager.nixosModules.home-manager {
-          {
-            home-manager.extraSpecialArgs = attrs;
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-            home-manager.users.dan = import ./home.nix;
+          home-manager.users.dan = (import ./home.nix) { inherit helium colmena zen-browser nixpkgs-unstable nix-gaming hyprland-plugins; };
           home-manager.backupFileExtension = "backup";
         }
         ./configuration.nix

home.nix

@@ -1,17 +1,5 @@
-{
+{ helium, colmena, zen-browser, nix-gaming, nixpkgs-unstable, /* suyu, */hyprland-plugins/*, hyprland*/, ... }:
-  helium,
+{ pkgs, inputs, ...}:
-  colmena,
-  dms,
-  zen-browser,
-  nix-gaming,
-  nixpkgs-unstable, # suyu,
-  hyprland-plugins, # , hyprland
-  pkgs,
-  danksearch,
-  niri,
-  inputs,
-  ...
-}:
 let
 
   unstable = import nixpkgs-unstable {
@@ -20,31 +8,16 @@ let
 	    allowUnfree = true;
     };
   };
-  # system = stdenv.hostPlatform.system;
+
 in
 {
     imports = [
       zen-browser.homeModules.beta
-    dms.homeModules.dank-material-shell
-    danksearch.homeModules.default
-    # niri.homeManagerModules.default
-    # dms.homeModules.niri
     ];
     home = {
         stateVersion = "25.11";
 
         packages = with pkgs; [
-      bun
-      lenovo-legion
-      itch
-      filezilla
-      nicotine-plus
-      protonvpn-gui
-      dgop
-      mysql-workbench
-      i2c-tools
-      kdePackages.kimageformats
-      power-profiles-daemon
             tail-tray
             steam
             helium
@@ -55,7 +28,7 @@ in
             samply
             font-awesome
             arduino-ide
-      libxkbfile
+            xorg.libxkbfile
         
 #            dioxus-cli
             cosmic-files
@@ -88,7 +61,7 @@ in
             kubernetes-helm
 
             # required by quickshell config
-      # unstable.quickshell
+            unstable.quickshell
             wlogout
             fuzzel
             translate-shell
@@ -245,7 +218,7 @@ in
             inxi
             numbat
             wireshark
-      nixfmt
+            nixfmt-rfc-style
             qpwgraph
 
             nixpkgs-unstable.legacyPackages.${system}.zed-editor
@@ -327,25 +300,11 @@ in
         #     hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails
         # ];
     };
-  programs.dsearch.enable = true;
-  programs.dank-material-shell = {
-    enable = true;
-    systemd.enable = false;
-    # niri = {
-    #   enableKeybinds = false; # Sets static preset keybinds
-    #   # enableSpawn = true; # Auto-start DMS with niri, if enabled
-    # };
-  };
-  # programs.niri.enable = true;
     fonts.fontconfig = {
         enable = true;
         defaultFonts = {
             emoji = ["Noto Color Emoji"];
-      monospace = [
+            monospace = ["Iosevka" "Iosevka NF" "FiraCode Nerd Font Mono"];
-        "Iosevka"
-        "Iosevka NF"
-        "FiraCode Nerd Font Mono"
-      ];
             sansSerif = ["Inter"];
             serif = ["Noto Serif"];
         };
@@ -358,14 +317,8 @@ in
                 source ~/.config/fish/config-old.fish
             '';
             plugins = with pkgs.fishPlugins; [
-        {
+                { name = "grc"; src = grc.src; }
-          name = "grc";
+                { name = "tide"; src = tide.src; }
-          src = grc.src;
-        }
-        {
-          name = "tide";
-          src = tide.src;
-        }
             ];
         };
         nushell = {
@@ -383,7 +336,7 @@ in
             #     units
             # ];
             # configFile.source = ./.config/nushell/base-config.nu;
-      configFile.text = "source base-config.nu";
+            configFile.text = ''source base-config.nu'';
         };
         vscode = {
             enable = true;
@@ -393,23 +346,22 @@ in
 
             # ];
         };
-    difftastic.enable = true;
-    difftastic.git.enable = true;
         git = {
             enable = true;
-      settings = {
+            userName  = "Daniel Bulant";
-        user.name = "Daniel Bulant";
+            userEmail = "danbulant@gmail.com";
-        user.email = "danbulant@gmail.com";
+            difftastic.enable = true;
+            signing = {
+                signByDefault = true;
+                key = "/home/dan/.ssh/id_ed25519";
+            };
+            extraConfig = {
                 pull.rebase = false;
                 pull.ff = "only";
                 gpg.format = "ssh";
                 commit.gpgsign = true;
                 gpg.ssh.allowedSignersFile = "/home/dan/allowed_signers";
             };
-      signing = {
-        signByDefault = true;
-        key = "/home/dan/.ssh/id_ed25519";
-      };
         };
         gitui.enable = true;
         btop.enable = true;

hypr-copy.sh

@@ -1 +0,0 @@
-cp .config/hypr/* ~/.config/hypr/ -r