a

flake.lock

@@ -80,18 +80,6 @@
         "url": "https://git.gaze.systems/dusk/website.git"
       }
     },
-    "catppuccin-discord": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-Yic2wQb2Dg86yimbTXDVdRcN1N+9FJrY34PQKpQuRfo=",
-        "type": "file",
-        "url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
-      }
-    },
     "crane": {
       "flake": false,
       "locked": {
@@ -494,11 +482,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1674602802,
-        "narHash": "sha256-MXq9P36zSJTD0yFd1cXC9AV6WJZJuL36R1rrwDlc0d4=",
+        "lastModified": 1676058777,
+        "narHash": "sha256-zyIksNoVO6WqGv1ezsgbGdRdA9XFzw/MQrv7V0ewfGc=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "91dca3f667e146f93e6dca205b0a3f2a7a64b488",
+        "rev": "6929a12f291fa5dee50cde9c89845b206b7333fd",
         "type": "github"
       },
       "original": {
@@ -515,11 +503,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1674556204,
-        "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=",
+        "lastModified": 1675935446,
+        "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6",
+        "rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
         "type": "github"
       },
       "original": {
@@ -539,11 +527,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1674604320,
-        "narHash": "sha256-yhSiPmT3fmOaV2dLBNCsGGpN4t2Ucs6Q3dGygBH34sc=",
+        "lastModified": 1676066608,
+        "narHash": "sha256-wUfFD5kZ4+MSX92Zruy/W64m7E5CzORfiVdLOuyJ15o=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "12e293e3092b03dbb9d82e7a749f482ef2b7ea6e",
+        "rev": "bda8208aaa3d7eb9f14d49691b919f8f2e9f5594",
         "type": "github"
       },
       "original": {
@@ -653,11 +641,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1674573236,
-        "narHash": "sha256-VN1KG1Sh9s5IpLzVhCYAQcBITh4jmG8gl0F4wBX8lVk=",
+        "lastModified": 1676062747,
+        "narHash": "sha256-jUZrWQRIO/lDeInw1Kn6WSnQxbuSfakOsTcBQiztxRQ=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "6e5321582ca7595455edf2a9643f83ce390d0a71",
+        "rev": "a304ab352b1194d6b6e0dd2ca3efe979dcbb50c9",
         "type": "github"
       },
       "original": {
@@ -707,11 +695,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1674550793,
-        "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
+        "lastModified": 1675933606,
+        "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
+        "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2",
         "type": "github"
       },
       "original": {
@@ -722,11 +710,11 @@
     },
     "nixos-persistence": {
       "locked": {
-        "lastModified": 1668668915,
-        "narHash": "sha256-QjY4ZZbs9shwO4LaLpvlU2bO9J1juYhO9NtV3nrbnYQ=",
+        "lastModified": 1675359654,
+        "narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "5df9108b346f8a42021bf99e50de89c9caa251c3",
+        "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd",
         "type": "github"
       },
       "original": {
@@ -787,11 +775,11 @@
     "nixpkgs-wayland": {
       "flake": false,
       "locked": {
-        "lastModified": 1674656022,
-        "narHash": "sha256-/GPbEGC4rfvG/ySNmwGmXA9w7o0NxducqVXJJREN328=",
+        "lastModified": 1676084149,
+        "narHash": "sha256-abTVSVKLol9er5rXPFJ65lB7kIGv3pFswLYtsJd3+Cg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "880c0dc1dc100b2938e49206cc145fbec39ca532",
+        "rev": "13ad7c7fe8e309526caa18cbcfb7a7c87c51cfd6",
         "type": "github"
       },
       "original": {
@@ -834,11 +822,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1674459583,
-        "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
+        "lastModified": 1675942811,
+        "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
+        "rev": "724bfc0892363087709bd3a5a1666296759154b1",
         "type": "github"
       },
       "original": {
@@ -850,11 +838,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1674651781,
-        "narHash": "sha256-EXq3gfw6uJLlyaSkv1GiFuJx5fVkBFKeAe2UBqTZ7wA=",
+        "lastModified": 1676087160,
+        "narHash": "sha256-el2tNbWUhpz0IBoORS144xjMTi9WIqbQWRBmrsF4M64=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "30a00b5df32dfa34f069e83bc92283bd614cd021",
+        "rev": "1ddd5cf5cc7215ea63f1dee09016b53cc79034e5",
         "type": "github"
       },
       "original": {
@@ -867,7 +855,6 @@
       "inputs": {
         "bernbot": "bernbot",
         "blog": "blog",
-        "catppuccin-discord": "catppuccin-discord",
         "eww": "eww",
         "helix": "helix",
         "home": "home",
@@ -955,11 +942,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1674095406,
-        "narHash": "sha256-RexH/1rZTiX4OhdYkuJP3MuANJ+JRgoLKL60iHm//T0=",
+        "lastModified": 1675391458,
+        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "5f7315b9800e2e500e6834767a57e39f7dbfd495",
+        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
         "type": "github"
       },
       "original": {
@@ -1004,11 +991,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1672824257,
-        "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=",
+        "lastModified": 1675374853,
+        "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "5f264a7d6c8af27d41ff440c05262b022c055593",
+        "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58",
         "type": "gitlab"
       },
       "original": {

flake.nix

@@ -37,8 +37,8 @@
     eww.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-colors.url = "github:Misterio77/nix-colors";
-    catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
-    catppuccin-discord.flake = false;
+    # catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
+    # catppuccin-discord.flake = false;
   };
 
   outputs = inputs: let

modules/develop/godot.nix

@@ -1 +0,0 @@
-{pkgs, ...}: {environment.systemPackages = with pkgs; [godot-bin godot-headless-bin godot-server-bin];}

pkgs-set/overlays/obsidian.nix

@@ -1,12 +0,0 @@
-final: prev: {
-  obsidian = prev.obsidian.overrideAttrs (old: {
-    installPhase =
-      prev.lib.replaceStrings
-      ["makeWrapper ${final.electron_18}/bin/electron $out/bin/obsidian"]
-      [
-        ''          makeWrapper ${final.electron_20}/bin/electron $out/bin/obsidian \
-                  --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"''
-      ]
-      old.installPhase;
-  });
-}

pkgs-set/pkgs-to-export.nix

@@ -2,7 +2,6 @@ pkgs: (
   pkgs.lib.getAttrs
   [
     "fractal-next"
-    "obsidian"
     "comic-mono"
     "chromium"
     "discordo"

users/modules/chromium/default.nix

@@ -29,6 +29,7 @@
       "clngdbkpkpeebahjckkjfobafhncgmne" # stylus
       "hlepfoohegkhhmjieoechaddaejaokhf" # refined github
       "annfbnbieaamhaimclajlajpijgkdblo" # dark theme
+      "nblkbiljcjfemkfjnhoobnojjgjdmknf" # pronoundb
     ];
   };
 }

users/modules/sway/default.nix

@@ -95,7 +95,7 @@
           "type:touchpad" = {
             accel_profile = "adaptive";
             tap = "enabled";
-            scroll_method = "edge";
+            scroll_method = "two_finger";
             dwt = "enabled";
             events = "disabled_on_external_mouse";
           };
@@ -103,10 +103,10 @@
         output = {
           "*" = {
             bg = "${config.home.homeDirectory}/.config/wallpaper fill";
+            adaptive_sync = "on";
           };
           "eDP-1" = {
             scale = "2";
-            adaptive_sync = "off";
           };
           "HDMI-A-1" = {
             mode = "1920x1080@74.973Hz";

users/patriot/default.nix

@@ -117,8 +117,8 @@ in {
         # cli stuff
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
-        ["helix" "git" "ssh" "obsidian"]
-        ["lollypop" "newsflash"]
+        ["helix" "git" "ssh"]
+        ["lollypop"]
       ];
     in
       l.flatten [
@@ -218,10 +218,6 @@ in {
         dejavu_fonts
         # Programs
         bitwarden
-        cargo-outdated
-        cargo-release
-        cargo-udeps
-        vulkan-tools
         krita
         cachix
         gnupg
@@ -237,9 +233,11 @@ in {
         # fractal-next
         obs-studio
         libreoffice-fresh
-        helvum
+        # helvum
+        easyeffects
         nix-output-monitor
         prismlauncher
+        godot_4
       ];
     };
     programs = {