update

README.md

@@ -16,3 +16,7 @@ There is more that I'm using, but those are the main ones! Read my configs to ge
 
 ### Background
   - Got my background from [here](https://old.reddit.com/r/celestegame/comments/11dtgwg/all_most_of_the_backgrounds_in_celeste_edited/) and used the command `magick input.png -filter Point -resize 2880x1920! output.png` to upscale it bilinearly
+
+## TODO!
+- [ ] further unify desktop and laptop configs
+- [ ] Seperate out common shell utilities into a module or some sort (could be used on other machines)

etcnixos/common.nix

@@ -20,9 +20,32 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
+  nixpkgs.config.allowUnfree = true;
+
+  # allow overclocking (I actually underclock but lol)
+  hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF";
+
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
+        user = username;
+      };
+    };
+  };
+
+  system.activationScripts = {
+    # FIX: https://github.com/NixOS/nix/issues/2982
+    "profile-channel-dummy".text = ''
+      #!/bin/sh
+      mkdir -p /nix/var/nix/profiles/per-user/root/channels
+    '';
+  };
+
   swapDevices = [ ];
 
   nix = {

etcnixos/system-yarn.nix

@@ -16,35 +16,14 @@
     inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
     inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
   ];
-  nixpkgs.config.allowUnfree = true;
-
   networking.hostId = "abf570f9";
   boot = {
-    kernelParams = [
-      # allow overclocking (I actually underclock but lol)
-      "amdgpu.ppfeaturemask=0xFFF7FFFF"
-    ];
-
     kernelModules = [
       # kernel module for case fan control
       "nct6775"
     ];
   };
 
-  services.xserver.enable = false;
-  services.desktopManager.plasma6.enable = true;
-  services.displayManager = {
-    sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-
-    autoLogin = {
-      enable = true;
-      user = username;
-    };
-  };
-
   # services.openssh = {
   #   enable = true;
   #   ports = [ 22 ];

flake.lock

@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754361940,
+        "lastModified": 1754759269,
-        "narHash": "sha256-2KROQdENN8Ix5kiBZRM8FQP1KiJDikKPTiaaExYdVAY=",
+        "narHash": "sha256-pBinP8BzBYkEZ7+c1ZHgJIvZre4uvga0edme9QN4pBU=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "a9a667084c0cf89081842d3002aef7b4829980aa",
+        "rev": "d23079069762b731ba233d5ab2f72ab1bfa179e3",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1754098183,
+        "lastModified": 1754744872,
-        "narHash": "sha256-xiDTiBJlApXRiuTmOrdGaiJzs33lIdQepyCI8r9hy5w=",
+        "narHash": "sha256-rcMHMs+dFWaDXev092gfxTfxHEWcUY/6SRV+cseNevQ=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "f2a7b326dc420360a66a542f2262081763f0f9ab",
+        "rev": "346fc31bcc4d2dbcc3e8ce8dbb622e4255ff54b7",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1753983552,
+        "lastModified": 1754742008,
-        "narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=",
+        "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a",
+        "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1754316476,
+        "lastModified": 1754564048,
-        "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=",
+        "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28",
+        "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113",
         "type": "github"
       },
       "original": {
@@ -244,11 +244,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1754292888,
+        "lastModified": 1754689972,
-        "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
+        "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
+        "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
         "type": "github"
       },
       "original": {
@@ -304,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754276100,
+        "lastModified": 1754707163,
-        "narHash": "sha256-VmYP9Jo0U234xtGTGtihqNHfGy1JZ1h9WaaJlIuzgCk=",
+        "narHash": "sha256-wgVgOsyJUDn2ZRpzu2gELKALoJXlBSoZJSln+Tlg5Pw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "dc2d2489572fa8a3b86c15ff9fd01f99b90cb90d",
+        "rev": "ac39ab4c8ed7cefe48d5ae5750f864422df58f01",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1752338000,
+        "lastModified": 1754533920,
-        "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=",
+        "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "ba78881a68182ce338041846164cbfed0d70935c",
+        "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c",
         "type": "github"
       },
       "original": {
@@ -360,11 +360,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754193284,
+        "lastModified": 1754739276,
-        "narHash": "sha256-ZGLXnpXy7vcTDLC1yLQSJOclsilvK+RNFVVEeO0ei/0=",
+        "narHash": "sha256-HQotJt480NsHIEgkt2ZiuvjGa50sc7cRhhsZXqZIWpU=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "ac2b25e76f5bfe1e30ae39409dfa450c5c1bc945",
+        "rev": "b5b7136bb6ed82504c3613a7e0cbe6f69b72e7f1",
         "type": "github"
       },
       "original": {

home-manager/desktop.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    # niri wayland compositor
+    ./progs/niri.nix
+
+    # statusbar
+    ./progs/eww/eww.nix
+
+    # lockscreen
+    ./progs/swaylock.nix
+
+    # notification daemon
+    ./progs/dunst.nix
+  ];
+
+  home.packages = with pkgs; [
+    wdisplays
+    blueman
+
+    # used by /etc/nixos logic to launch niri
+    config.programs.niri.package
+  ];
+
+}

home-manager/home-mreow.nix

@@ -7,32 +7,12 @@
 {
   imports = [
     ./gui.nix
-
+    ./desktop.nix
-    # niri wayland compositor
-    ./progs/niri.nix
-
-    # statusbar
-    ./progs/eww/eww.nix
-
-    # lockscreen
-    ./progs/swaylock.nix
-
-    # notification daemon
-    ./progs/dunst.nix
-
     ./progs/borg.nix
 
     ./progs/framework-13-easyeffects.nix
   ];
 
-  home.packages = with pkgs; [
-    wdisplays
-    blueman
-
-    # used by /etc/nixos logic to launch niri
-    config.programs.niri.package
-  ];
-
   # media controls
   systemd.user.services.mpris-proxy = {
     Unit.Description = "Mpris proxy";

home-manager/home-yarn.nix

@@ -8,6 +8,7 @@
 {
   imports = [
     ./gui.nix
+    ./desktop.nix
   ];
 
   home.packages = with pkgs; [

home-manager/no-gui.nix

@@ -195,6 +195,8 @@ in
 
       # power stuff
       powerstat
+
+      nodePackages_latest.nodejs
     ]
     ++ rust_pkgs
     ++ lsps