update flake

.gitignore

@@ -1,2 +1 @@
-smb-secrets
 nixos-switch.log

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 chase
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.org

@@ -14,3 +14,4 @@ this is probably not that great of a reference.
 - https://github.com/kaleocheng/nix-dots/tree/master
 - https://gist.github.com/0atman/1a5133b842f929ba4c1e195ee67599d5
 - https://github.com/woioeow/hyprland-dotfiles/tree/main
+- https://github.com/HeinzDev/Hyprland-dotfiles 

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750372185,
+        "lastModified": 1755946532,
-        "narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=",
+        "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca",
+        "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1750153510,
+        "lastModified": 1756741629,
-        "narHash": "sha256-NYHXXJZ9m4fJpKk9tKn/EExX87SqcBcRINOGF7hKRLI=",
+        "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "4e95eaf8a351956d75cc400318579967ca2b6d0f",
+        "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1747046372,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750654717,
+        "lastModified": 1756842514,
-        "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=",
+        "narHash": "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b",
+        "rev": "30fc1b532645a21e157b6e33e3f8b4c154f86382",
         "type": "github"
       },
       "original": {
@@ -212,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749154018,
+        "lastModified": 1756679287,
-        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749155331,
+        "lastModified": 1753964049,
-        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371717,
+        "lastModified": 1755678602,
-        "narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=",
+        "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88",
+        "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1750681989,
+        "lastModified": 1756811803,
-        "narHash": "sha256-uxIwiV1p2SVNIoP+oD025lZKfq4zNn7CmdaYVoskqnQ=",
+        "narHash": "sha256-03zmDvAU+VLPWHv5uxfGVR6bs/SnCYeZ8hbedK/Eb/M=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "cf7e3aa448f8c9e0d9e8f407e6ed730da55acc69",
+        "rev": "127aab815908ecbd3db4d23f127d2e96b79855f9",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371812,
+        "lastModified": 1753819801,
-        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
+        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
         "owner": "hyprwm",
         "repo": "hyprland-qtutils",
-        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
+        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
         "type": "github"
       },
       "original": {
@@ -422,11 +422,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371198,
+        "lastModified": 1753622892,
-        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
+        "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
+        "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
         "type": "github"
       },
       "original": {
@@ -447,11 +447,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371096,
+        "lastModified": 1756117388,
-        "narHash": "sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c=",
+        "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "38f3a211657ce82a1123bf19402199b67a410f08",
+        "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
         "type": "github"
       },
       "original": {
@@ -472,11 +472,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371869,
+        "lastModified": 1755184602,
-        "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=",
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
         "type": "github"
       },
       "original": {
@@ -513,11 +513,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1756266583,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
         "type": "github"
       },
       "original": {
@@ -545,11 +545,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1750400657,
+        "lastModified": 1756754095,
-        "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
+        "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
+        "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9",
         "type": "github"
       },
       "original": {
@@ -561,11 +561,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1750365781,
+        "lastModified": 1756266583,
-        "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
+        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
+        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
         "type": "github"
       },
       "original": {
@@ -577,11 +577,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1750506804,
+        "lastModified": 1756787288,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {
@@ -596,15 +596,14 @@
         "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1750681334,
+        "lastModified": 1756875847,
-        "narHash": "sha256-eJ/y5dob2thCl0vyMpFnAp46m/KMnPPAIOd7rGaIHQU=",
+        "narHash": "sha256-2L4kOvvCDUDBBBliCNiEXrYN0VqqkB0YHuOGckpp5X8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c5faf8a9899f991483233eebba852128b06e7004",
+        "rev": "bffccde9bd7869ab355b76d53fbc25ac1f7d37eb",
         "type": "github"
       },
       "original": {
@@ -623,11 +622,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748196248,
+        "lastModified": 1756632588,
-        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
+        "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
+        "rev": "d47428e5390d6a5a8f764808a4db15929347cd77",
         "type": "github"
       },
       "original": {
@@ -646,11 +645,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749636823,
+        "lastModified": 1755960406,
-        "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
+        "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "623c56286de5a3193aa38891a6991b28f9bab056",
+        "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
         "type": "github"
       },
       "original": {
@@ -728,11 +727,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750119275,
+        "lastModified": 1754988908,
-        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -756,27 +755,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -805,11 +783,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750372504,
+        "lastModified": 1755354946,
-        "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=",
+        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92",
+        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,7 +4,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
-
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,12 +12,10 @@
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
-
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +24,6 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     catppuccin.url = "github:catppuccin/nix";
     hyprland.url = "github:hyprwm/Hyprland";
     plasma-manager = {
@@ -94,6 +90,7 @@
             {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
               home-manager.sharedModules = [
                 plasma-manager.homeManagerModules.plasma-manager
                 sops-nix.homeManagerModules.sops

home/base.nix

@@ -18,8 +18,17 @@
       "$HOME/scripts"
     ];
     sessionVariables = {
-      SSH_AUTH_SOCK = /home/chase/.bitwarden-ssh-agent.sock;
+      # Aspell stuff
+      ASPELL_CONF = "per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_DATA_HOME/aspell/en.pws; repl $XDG_DATA_HOME/aspell/en.prepl";
+      # Bitwarden stuff
+      BITWARDEN_SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
+      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
       ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+      # Java stuff
+      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='$XDG_CONFIG_HOME'/java";
+      # libx11 stuff
+      XCOMPOSECACHE = "$XDG_CACHE_HOME/X11/xcompose";
+      XCOMPOSEFILE = "$XDG_CONFIG_HOME/X11/xcompose";
     };
     shellAliases = {
       gs = "git status";
@@ -130,12 +139,24 @@
     };
   };
 
+  programs.fzf = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+
   programs.git = {
     enable = true;
     userName = "chase";
     userEmail = "chase@cathoderaytube.net";
     extraConfig = {
       init.defaultBranch = "main";
+      pull.rebase = true;
+    };
+    signing = {
+      format = "ssh";
+      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFSQX+s8Krl312DcnUtoEWOA2silcUnt5URtyVZz8Yek";
+      signByDefault = true;
     };
   };
 
@@ -181,8 +202,6 @@
     };
   };
 
-  programs.texlive.enable = true;
-
   programs.yazi = {
     enable = true;
     enableBashIntegration = true;
@@ -219,5 +238,6 @@
     lm_sensors
     lolcat
     nerd-fonts.blex-mono
+    texliveFull
   ];
 }

home/desktop.nix

@@ -20,18 +20,42 @@
         id = 0;
         name = "default";
         isDefault = true;
+        containers = {
+          personal = {
+            color = "purple";
+            icon = "fingerprint";
+            id = 1;
+          };
+          work = {
+            color = "orange";
+            icon = "briefcase";
+            id = 2;
+          };
+          social = {
+            color = "blue";
+            icon = "chill";
+            id = 3;
+          };
+          dev = {
+            color = "green";
+            icon = "circle";
+            id = 4;
+          };
+        };
+        containersForce = true;
         extensions = {
+          force = true;
           packages = with pkgs.nur.repos.rycee.firefox-addons; [
             awesome-rss
             betterttv
             bitwarden
-            clearurls
+            blocktube
-            enhancer-for-youtube
             facebook-container
             flagfox
+            hyperchat
             istilldontcareaboutcookies
             linkwarden
-            privacy-badger
+            livetl
             return-youtube-dislikes
             search-by-image
             sponsorblock
@@ -39,9 +63,48 @@
             tampermonkey
             ublock-origin
             windscribe
+            ytcfilter
+          ];
+          settings = {
+            "uBlock0@raymondhill.net" = {
+              force = true;
+              settings = {
+                selectedFilterLists = [
+                  "ublock-filters"
+                  "ublock-badware"
+                  "ublock-privacy"
+                  "ublock-unbreak"
+                  "ublock-quick-fixes"
+                  "easylist"
+                  "easyprivacy"
+                  "urlhaus-1"
+                  "plowe-0"
+                  "fanboy-cookiemonster"
+                  "ublock-cookies-easylist"
+                  "adguard-cookies"
+                  "ublock-cookies-adguard"
+                  "ublock-annoyances"
+                  "https://git.traphouse.cathoderaytube.net/chase/ublock-filters/raw/branch/main/chase-all.txt"
+                  "user-filters"
+                ];
+                importedLists = [
+                  "https://git.traphouse.cathoderaytube.net/chase/ublock-filters/raw/branch/main/chase-all.txt"
                 ];
               };
+            };
+            "Tab-Session-Manager@sienori" = {
               settings = {
+                "startupBehavior" = ["previousSession"];
+                "Settings" = {
+                  "startupBehavior" = "previousSession";
+                  "openButtonBehavior" = "openInCurrentWindow";
+                };
+              };
+            };
+          };
+        };
+        settings = {
+          "apz.gtk.touchpad_pinch.enabled" = false;
           "browser.formfill.enable" = false;
           "browser.ml.chat.enabled" = false;
           "browser.ml.chat.shortcuts" = false;
@@ -56,13 +119,22 @@
           "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
           "browser.newtabpage.activity-stream.system.showSponsored" = false;
           "browser.topsites.contile.enabled" = false;
+          "browser.urlbar.trimURLs" = false;
           "browser.urlbar.unitConversion.enabled" = true;
+          "dom.security.https_only_mode" = true;
           "extensions.formautofill.addresses.enabled" = false;
           "extensions.formautofill.creditCards.enabled" = false;
           "extensions.pocket.enabled" = false;
           "general.autoScroll" = true;
-          "widget.use-xdg-desktop-portal.file-picker" = 1;
+          "permissions.default.geo" = 2;
+          "privacy.bounceTrackingProtection.mode" = 1;
+          "privacy.fingerprintingProtection" = true;
+          "privacy.trackingprotection.consentmanager.skip.pbmode.enabled" = false;
+          "privacy.trackingprotection.emailtracking.enabled" = true;
+          "privacy.trackingprotection.enabled" = true;
+          "privacy.trackingprotection.socialtracking.enabled" = true;
           "signon.rememberSignons" = false;
+          "widget.use-xdg-desktop-portal.file-picker" = 1;
         };
         search = {
           force = true;
@@ -80,7 +152,7 @@
             "Nix Packages" = {
               urls = [
                 {
-                  template = "https://search.nixos.org/packages";
+                  template = "https://search.nixos.org/packages?channel=unstable";
                   params = [
                     {
                       name = "type";
@@ -141,13 +213,13 @@
 
   home.packages = with pkgs; [
     anki-bin
-    audacity
     gimp
     ibm-plex
     kdePackages.kdenlive
     libnotify
     libreoffice
     logiops
+    openutau
     picard
     protonmail-bridge
     (pkgs.python3.withPackages (python-pkgs: [
@@ -160,6 +232,7 @@
     waybar
     waybar-mpris
   ];
+
   services.arrpc.enable = true;
 
   services.emacs = {
@@ -175,31 +248,6 @@
     defaultEditor = true;
   };
 
-  services.mako = {
-    enable = true;
-    settings = {
-      actions = true;
-      anchor = "top-right";
-      background-color = "#1e1e2e";
-      border-color = "#cba6f7";
-      border-radius = 0;
-      default-timeout = 0;
-      font = "monospace 10";
-      height = 100;
-      width = 300;
-      icons = true;
-      ignore-timeout = false;
-      layer = "top";
-      margin = 10;
-      markup = true;
-
-      # Section example
-      "actionable=true" = {
-        anchor = "top-left";
-      };
-    };
-  };
-
   services.mpd = {
     enable = true;
     extraConfig = ''

home/emacs/early-init.el

@@ -40,7 +40,7 @@
   (load custom-file))
 
 ;; backup directory instead of loose files
-(setq backup-directory-alist '(("." . "~/.config/emacs/backups")))
+(setq backup-directory-alist '(("." . (expand-file-name "backups/" user-emacs-directory))))
 (setq backup-by-copying t)
 
 ;; defer package initialize
@@ -49,11 +49,6 @@
 ;; prevent resizing of the frame
 (setq frame-inhibit-implied-resize t)
 
-;; no bars
-;;(menu-bar-mode -1)
-;;(tool-bar-mode -1)
-;;(scroll-bar-mode -1)
-
 ;; no startup screen
 (setq inhibit-startup-screen t)
 

home/emacs/init.el

@@ -112,6 +112,26 @@
   :config
   (evil-collection-init))
 
+(use-package evil-surround
+  :config
+  (global-evil-surround-mode 1))
+
+(use-package vertico
+  :custom
+  (vertico-cycle t)
+  :init
+  (vertico-mode))
+
+(use-package savehist
+  :init
+  (savehist-mode))
+
+(use-package orderless
+  :custom
+  (completion-styles '(orderless basic))
+  (completion-category-defaults nil)
+  (completion-category-overrides '((file (styles partial-completion)))))
+
 ;; prevent laggy icons
 (setq inhibit-compacting-font-caches t)
 
@@ -124,6 +144,11 @@
   :config
   (nerd-icons-completion-mode))
 
+(use-package nerd-icons-corfu
+  :after corfu
+  :config
+  (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
+
 (use-package nerd-icons-dired
   :hook
   (dired-mode . nerd-icons-dired-mode))
@@ -155,6 +180,7 @@
 (column-number-mode)
 
 ;; line numbers, not quite everywhere
+(setq-default display-line-numbers-type 'relative)
 (add-hook 'prog-mode-hook #'display-line-numbers-mode)
 (add-hook 'text-mode #'display-line-numbers-mode)
 
@@ -187,15 +213,17 @@
 (setq ibuffer-saved-filter-groups
 	  '(("Default"
          ("Terminal" (name . "^\\*terminal\\*$"))
+         ("Nix"      (mode . nix-ts-mode))
 		 ("Code"     (or
 				      (mode . c-ts-mode)
 				      (mode . c++-ts-mode)
+                      (mode . emacs-lisp-mode)
 				      (mode . js-ts-mode)
                       (mode . makefile-gmake-mode)
 				      (mode . python-ts-mode)
 				      (mode . rust-ts-mode)))
-		 ("Dired"    (mode . dired-mode))
 		 ("Org"      (mode . org-mode))
+		 ("Dired"    (mode . dired-mode))
 		 ("Magit"    (name . "^magit"))
 		 ("Emacs"    (or
 				      (name . "^\\*Completions\\*$")
@@ -206,10 +234,19 @@
 
 (add-hook 'ibuffer-mode-hook
 		  (lambda ()
-			(ibuffer-switch-to-saved-filter-groups "Default")))
+			(ibuffer-switch-to-saved-filter-groups "Default")
+            (ibuffer-auto-mode 1)))
+
+;; make dired less messy
+(setf dired-kill-when-opening-new-dired-buffer t)
+
+;; kill buffers
+(substitute-key-definition 'kill-buffer 'kill-buffer-and-window global-map)
 
 ;; git stuff
-(use-package magit)
+(use-package magit
+  :config
+  (setq magit-bury-buffer-function 'kill-buffer))
 
 (use-package magit-todos
   :after magit)
@@ -245,15 +282,26 @@
   :config
   (treemacs-load-theme "nerd-icons"))
 
-;; company
+;; corfu
-(use-package company
+(use-package corfu
-  :bind (:map company-active-map
+  :custom
-			  ("C-n" . company-select-next)
+  (corfu-cycle t)
-			  ("C-p" . company-select-previous))
+  (corfu-auto t)
+  (corfu-auto-prefix 2)
+  (corfu-auto-delay 0.2)
+  (corfu-quit-at-boundary 'separator)
+  (corfu-echo-documentation 0.25)
   :init
-  (global-company-mode)
+  (when (>= emacs-major-version 30)
-  :config
+    (global-completion-preview-mode 1))
-  (setq company-idle-delay 0.1)) ;; faster autocomplete
+  (unless (display-graphic-p)
+    (when (require 'corfu-terminal nil :noerror)
+      (corfu-terminal-mode +1)))
+  (global-corfu-mode 1)
+  (corfu-history-mode 1))
+
+;; license templates
+(use-package license-templates)
 
 ;; yasnippet config
 (use-package yasnippet
@@ -405,6 +453,9 @@
   (add-to-list 'org-structure-template-alist '("json" . "src json"))
   (add-to-list 'org-structure-template-alist '("yaml" . "src yaml"))
 
+  ;; babel
+  (add-to-list 'org-babel-load-languages '(shell . t))
+
   ;; fix yaml fontify
   (add-to-list 'org-src-lang-modes '("yaml" . yaml-ts))
 
@@ -413,10 +464,10 @@
 		org-export-with-section-numbers nil)
 
   ;; LaTeX
-  (setq org-latex-compiler "xelatex")
+  ;;(setq org-latex-compiler "xelatex")
-  (setq org-latex-listings 'minted
+  ;;(setq org-latex-listings 'minted
-		org-latex-pdf-process
+		;;org-latex-pdf-process
-		'("latexmk -shell-escape -f -pdf -%latex -interaction=nonstopmode -output-directory=%o %f"))
+		;;'("latexmk -shell-escape -f -pdf -%latex -interaction=nonstopmode -output-directory=%o %f"))
 
   (use-package evil-org
 	:after org
@@ -488,11 +539,13 @@
 	:after org)
 
   (use-package ox-moderncv
-    :after org
+    :straight nil
-    :straight
+    :load-path "~/org-cv/"
-    (org-cv :type git :host gitlab :repo "Titan-C/org-cv"))
+    ;;(org-cv :type git :host gitlab :repo "Titan-C/org-cv"))
+    :init (require 'ox-moderncv))
 
-(use-package ox-hugocv
+
+  (use-package ox-hugocv
     :after org
     :straight
     (org-cv :type git :host gitlab :repo "Titan-C/org-cv")))

home/hypr.nix

@@ -3,12 +3,110 @@
   pkgs,
   ...
 }: {
-  programs.waybar = {
+  catppuccin = {
+    waybar = {
       enable = false;
+    # flavor = "mocha";
+    # mode = "createLink";
+	};
+	hyprland = {
+	  enable = false;
+    };
+  };
+  
+  programs.waybar = {
+    enable = true;
     systemd = {
       enable = true;
       target = "hyprland-session.target";
     };
+    style = ./waybar.css;
+    settings = [{
+        "layer" = "top";
+        "position" = "top";
+        modules-left = [
+          "custom/launcher"
+          "temperature"
+          "mpd"
+        ];
+        modules-center = [
+          "clock"
+        ];
+        modules-right = [
+          "pulseaudio"
+          "backlight"
+          "memory"
+          "cpu"
+          "network"
+          "custom/powermenu"
+          "tray"
+        ];
+        "custom/launcher" = {
+          "format" = " ";
+          "on-click" = "pkill rofi || rofi2";
+          "on-click-middle" = "exec default_wall";
+          "on-click-right" = "exec wallpaper_random";
+          "tooltip" = false;
+        };
+        "pulseaudio" = {
+          "scroll-step" = 1;
+          "format" = "{icon} {volume}%";
+          "format-muted" = "󰖁 Muted";
+          "format-icons" = {
+            "default" = [ "" "" "" ];
+          };
+          "on-click" = "pamixer -t";
+          "tooltip" = false;
+        };
+        "clock" = {
+          "interval" = 1;
+          "format" = "{:%H:%M}";
+          "tooltip" = true;
+          "tooltip-format"= "{:%Y-%m-%d}\n<tt>{calendar}</tt>";
+        };
+        "memory" = {
+          "interval" = 1;
+          "format" = "󰻠 {percentage}%";
+          "states" = {
+            "warning" = 85;
+          };
+        };
+        "cpu" = {
+          "interval" = 1;
+          "format" = "󰍛 {usage}%";
+        };
+        "mpd" = {
+          "max-length" = 25;
+          "format" = "<span foreground='#bb9af7'></span> {title}";
+          "format-paused" = " {title}";
+          "format-stopped" = "<span foreground='#bb9af7'></span>";
+          "format-disconnected" = "";
+          "on-click" = "rmpc togglepause";
+          "on-click-right" = "rmpc update";
+          "on-click-middle" = "kitty --class='rmpc' rmpc ";
+          "on-scroll-up" = "rmpc prev";
+          "on-scroll-down" = "rmpc next";
+          "smooth-scrolling-threshold" = 5;
+          "tooltip-format" = "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})";
+        };
+        "network" = {
+          "format-disconnected" = "󰯡";
+          "format-ethernet" = "󰒢";
+          "format-linked" = "󰖪 {essid} (No IP)";
+          "format-wifi" = "󰖩 {essid}";
+          "interval" = 1;
+          "tooltip" = false;
+        };
+        "custom/powermenu" = {
+          "format" = "";
+          "on-click" = "pkill rofi || ~/.config/rofi/powermenu/type-3/powermenu.sh";
+          "tooltip" = false;
+        };
+        "tray" = {
+          "icon-size" = 15;
+          "spacing" = 5;
+        };
+    }];
   };
 
   programs.hyprlock = {
@@ -52,6 +150,30 @@
     helvum
   ];
 
+  services.hypridle = {
+    enable = true;
+    settings = {
+      general = {
+        lock_cmd = "pidof hyprlock || hyprlock";
+        before_sleep_cmd = "loginctl lock-session";
+        after_sleep_cmd = "hyprctl dispatch dpms on";
+        ignore_dbus_inhibit = false;
+      };
+
+      listener = [
+        {
+          timeout = 600;
+          on-timeout = "loginctl lock-session";
+        }
+        {
+          timeout = 900;
+          on-timeout = "hyprctl dispatch dpms off";
+          on-resume = "hyprctl dispatch dpms on";
+        }
+      ];
+    };
+  };
+
   services.hyprpolkitagent.enable = true;
 
   services.hyprsunset.enable = true;
@@ -64,12 +186,37 @@
     };
   };
 
+  services.mako = {
+    enable = true;
+    settings = {
+      actions = true;
+      anchor = "top-right";
+      background-color = "#1e1e2e";
+      border-color = "#cba6f7";
+      border-radius = 0;
+      default-timeout = 0;
+      font = "monospace 10";
+      height = 100;
+      width = 300;
+      icons = true;
+      ignore-timeout = false;
+      layer = "top";
+      margin = 10;
+      markup = true;
+
+      # Section example
+      "actionable=true" = {
+        anchor = "top-right";
+      };
+    };
+  };
+
   services.network-manager-applet.enable = true;
 
   wayland.windowManager.hyprland = {
     enable = false;
-    package = null;
+    # package = null;
-    portalPackage = null;
+    # portalPackage = null;
     systemd.enable = true;
   };
 }

home/waybar.css

@@ -0,0 +1,123 @@
+* {
+    font-family: "JetBrainsMono Nerd Font";
+    font-size: 12pt;
+    font-weight: bold;
+    border-radius: 8px;
+    transition-property: background-color;
+    transition-duration: 0.5s;
+}
+@keyframes blink_red {
+    to {
+        background-color: rgb(242, 143, 173);
+        color: rgb(26, 24, 38);
+    }
+}
+.warning, .critical, .urgent {
+    animation-name: blink_red;
+    animation-duration: 1s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+window#waybar {
+    background-color: transparent;
+}
+window > box {
+    margin-left: 5px;
+    margin-right: 5px;
+    margin-top: 5px;
+    background-color: #1e1e2a;
+    padding: 3px;
+    padding-left:8px;
+    border: 2px none #33ccff;
+}
+#workspaces {
+    padding-left: 0px;
+    padding-right: 4px;
+}
+#workspaces button {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 6px;
+    padding-right: 6px;
+}
+#workspaces button.active {
+    background-color: rgb(181, 232, 224);
+    color: rgb(26, 24, 38);
+}
+#workspaces button.urgent {
+    color: rgb(26, 24, 38);
+}
+#workspaces button:hover {
+    background-color: rgb(248, 189, 150);
+    color: rgb(26, 24, 38);
+}
+tooltip {
+    background: rgb(48, 45, 65);
+}
+tooltip label {
+    color: rgb(217, 224, 238);
+}
+#custom-launcher {
+    font-size: 20px;
+    padding-left: 8px;
+    padding-right: 6px;
+    color: #7ebae4;
+}
+#mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+/* #mode { */
+/* 	margin-left: 10px; */
+/* 	background-color: rgb(248, 189, 150); */
+/*     color: rgb(26, 24, 38); */
+/* } */
+#memory {
+    color: rgb(181, 232, 224);
+}
+#cpu {
+    color: rgb(245, 194, 231);
+}
+#clock {
+    color: rgb(217, 224, 238);
+}
+/* #idle_inhibitor {
+color: rgb(221, 182, 242);
+}*/
+#custom-wall {
+    color: #33ccff;
+}
+#temperature {
+    color: rgb(150, 205, 251);
+}
+#backlight {
+    color: rgb(248, 189, 150);
+}
+#pulseaudio {
+    color: rgb(245, 224, 220);
+}
+#network {
+    color: #ABE9B3;
+}
+#network.disconnected {
+    color: rgb(255, 255, 255);
+}
+#custom-powermenu {
+    color: rgb(242, 143, 173);
+    padding-right: 8px;
+}
+#tray {
+    padding-right: 8px;
+    padding-left: 10px;
+}
+#mpd.paused {
+    color: #414868;
+    font-style: italic;
+}
+#mpd.stopped {
+    background: transparent;
+}
+#mpd {
+    color: #c0caf5;
+}

hosts/anzu/configuration.nix

@@ -7,6 +7,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../nixos/desktop.nix
+    ../../nixos/plasma.nix
     ../../nixos/hypr.nix
   ];
 
@@ -19,6 +20,15 @@
     ];
   };
 
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+
+  boot.lanzaboote = {
+    enable = true;
+    pkiBundle = "/var/lib/sbctl";
+  };
+
   # Mount SMB share
   fileSystems."/mnt/share" = {
     device = "//haruko/share";
@@ -27,14 +37,13 @@
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,user,users";
       credentials = "${config.sops.templates."smb-credentials".path}";
     in ["${automount_opts},credentials=${credentials},uid=1000,gid=100"];
-    #in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"];
   };
 
-  boot.loader.systemd-boot.enable = lib.mkForce false;
+  networking.wg-quick.interfaces = {
-
+    wg0 = {
-  boot.lanzaboote = {
+      configFile = "/home/chase/wg0.conf";
-    enable = true;
-    pkiBundle = "/var/lib/sbctl";
     };
+  };
+
   system.stateVersion = "24.11";
 }

hosts/anzu/hardware-configuration.nix

@@ -20,7 +20,7 @@
   boot.initrd.luks.devices."luks-9527937d-2d02-4feb-9a16-c9c417b33d0d".device = "/dev/disk/by-uuid/9527937d-2d02-4feb-9a16-c9c417b33d0d";
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = ["amdgpu"];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 

hosts/ichigo/configuration.nix

@@ -6,6 +6,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../nixos/desktop.nix
+    ../../nixos/plasma.nix
     ../../nixos/hypr.nix
   ];
 
@@ -18,6 +19,8 @@
     ];
   };
 
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
   # Mount SMB share
   fileSystems."/mnt/share" = {
     device = "//haruko/share";
@@ -26,7 +29,6 @@
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,user,users";
       credentials = "${config.sops.templates."smb-credentials".path}";
     in ["${automount_opts},credentials=${credentials},uid=1000,gid=100"];
-    #in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"];
   };
 
   system.stateVersion = "24.11";

hosts/ichigo/hardware-configuration.nix

@@ -19,7 +19,7 @@
   boot.initrd.luks.devices."luks-877310a4-b495-4060-9ee6-e7a841862f22".device = "/dev/disk/by-uuid/877310a4-b495-4060-9ee6-e7a841862f22";
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = ["amdgpu"];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 

nixos/base.nix

@@ -10,7 +10,7 @@
     efi.canTouchEfiVariables = true;
     systemd-boot = {
       enable = true;
-      configurationLimit = 10;
+      configurationLimit = 5;
     };
   };
 
@@ -47,7 +47,7 @@
     LC_NUMERIC = "en_US.UTF-8";
     LC_PAPER = "en_US.UTF-8";
     LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "C.UTF-8";
+    LC_TIME = "en_GB.UTF-8";
   };
 
   # Configure keymap
@@ -61,7 +61,7 @@
   # Allow power management
   powerManagement.enable = true;
 
-  # Enable networking
+  # NetworkManager
   networking.networkmanager.enable = true;
 
   # Catppuccin
@@ -184,6 +184,7 @@
     sops
     usbutils
     wget
+    wireguard-tools
     yubikey-manager
   ];
 

nixos/desktop.nix

@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   pkgs,
   inputs,
   ...
@@ -13,21 +14,16 @@
   # Enable Bluetooth
   hardware.bluetooth.enable = true;
 
-  # Enable the KDE Plasma Desktop Environment.
+  # Enable SDDM
   services.xserver.enable = true;
   services.displayManager.sddm = {
     enable = true;
+    package = lib.mkDefault pkgs.kdePackages.sddm;
     extraPackages = [pkgs.kdePackages.sddm-kcm];
     wayland.enable = true;
     enableHidpi = true;
   };
 
-  services.desktopManager.plasma6.enable = true;
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    elisa
-    kate
-  ];
-
   # Catppuccin
   catppuccin = {
     sddm = {
@@ -58,10 +54,14 @@
   # Fonts
   fonts = {
     packages = with pkgs; [
+      corefonts
       font-awesome
+      hachimarupop
       ibm-plex
+      kanji-stroke-order-font
       liberation_ttf
       nerd-fonts.blex-mono
+      nerd-fonts.jetbrains-mono
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
@@ -108,17 +108,9 @@
   # List packages installed in system profile.
   environment.systemPackages = with pkgs; [
     bitwarden-desktop
-    (catppuccin-kde.override {
-      flavour = ["mocha"];
-      accents = [
-        "blue"
-        "lavender"
-        "pink"
-        "sapphire"
-      ];
-      winDecStyles = ["classic"];
-    })
     firefoxpwa
+    kdePackages.dolphin
+    protonup-qt
     qpwgraph
     yubioath-flutter
   ];

nixos/plasma.nix

@@ -0,0 +1,24 @@
+{
+  pkgs,
+  ...
+}: {
+  services.desktopManager.plasma6.enable = true;
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    elisa
+    kate
+  ];
+
+  # List packages installed in system profile.
+  environment.systemPackages = with pkgs; [
+    (catppuccin-kde.override {
+      flavour = ["mocha"];
+      accents = [
+        "blue"
+        "lavender"
+        "pink"
+        "sapphire"
+      ];
+      winDecStyles = ["classic"];
+    })
+  ];
+}