nixvim: Enable fugitive and emmet_ls

I was missing out on fugitive :^)

flake.lock

@@ -98,11 +98,11 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1773224147,
+        "lastModified": 1775848911,
-        "narHash": "sha256-w9RQyKZSTfqoZPRzIf7H4qVHy2N6uFk1MUU+c1K4c40=",
+        "narHash": "sha256-dqva/tlWxsXj32wYPdt06UrrR4l2QdK9JWyvPooWRi4=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "97bd69ff570dddccd704077830446ec1ca3a6988",
+        "rev": "b36cbd5fc01e9794a001ccb0c58b314efaabae08",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1772408722,
+        "lastModified": 1775087534,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773264488,
+        "lastModified": 1775425411,
-        "narHash": "sha256-rK0507bDuWBrZo+0zts9bCs/+RRUEHuvFE5DHWPxX/Q=",
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5c0f63f8d55040a7eed69df7e3fcdd15dfb5a04c",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1772999353,
+        "lastModified": 1773693634,
-        "narHash": "sha256-dPb0WxUhFaz6wuR3B6ysqFJpsu8txKDPZvS47AT2XLI=",
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "545a4df146fce44d155573e47f5a777985acf912",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
         "type": "github"
       },
       "original": {
@@ -234,11 +234,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773375660,
+        "lastModified": 1775811116,
-        "narHash": "sha256-SEzUWw2Rf5Ki3bcM26nSKgbeoqi2uYy8IHVBqOKjX3w=",
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3e20095fe3c6cbb1ddcef89b26969a69a1570776",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1772328832,
+        "lastModified": 1774748309,
-        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1773282481,
+        "lastModified": 1775710090,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -326,6 +326,22 @@
         "type": "github"
       }
     },
+    "orly-covers": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1482210547,
+        "narHash": "sha256-3uU/RbOCZQS8kFu74zHpsHilQoaz9Jhv3vluI9axVPk=",
+        "owner": "thepracticaldev",
+        "repo": "orly-full-res",
+        "rev": "15c2b8dc906a7027391c11f559249c57e1a0a056",
+        "type": "github"
+      },
+      "original": {
+        "owner": "thepracticaldev",
+        "repo": "orly-full-res",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -339,6 +355,7 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
+        "orly-covers": "orly-covers",
         "rust-overlay": "rust-overlay",
         "secrets": "secrets",
         "spicetify-nix": "spicetify-nix",
@@ -352,11 +369,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773457417,
+        "lastModified": 1776050130,
-        "narHash": "sha256-waABTSxPdbxml4BhcabHhyQF02Qnj27qRU4ard0mTQo=",
+        "narHash": "sha256-/f/6/1WOfBJaGMfqV3VxWD9lpFRbPpF+Cx4MO+0mGok=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "055977c30249484010750e03074c744dcdaa0d23",
+        "rev": "3c27f4c92a7d977556dd2c10bb564d9c61b375e9",
         "type": "github"
       },
       "original": {
@@ -385,11 +402,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1773161309,
+        "lastModified": 1775421933,
-        "narHash": "sha256-k2Un0blYBeoN8mB5HO4rqCKISb427IWy0fzCdCUIcio=",
+        "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "61df7293cf732c7b66cce7f8b46f7017e721a6cd",
+        "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096",
         "type": "github"
       },
       "original": {
@@ -465,11 +482,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773290160,
+        "lastModified": 1775710180,
-        "narHash": "sha256-u09eF4Oafi+OIbTtKe/EWil26q1glcTATiSA7dF1oCI=",
+        "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "c7cb51b30960757ed9fb8eb28567b32585d0a688",
+        "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -36,6 +36,10 @@
       url = "github:nix-community/nixvim/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    orly-covers = {
+      url = "github:thepracticaldev/orly-full-res";
+      flake = false;
+    };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";

modules/factory/hyprpaper.nix

@@ -1,22 +0,0 @@
-{
-  config.flake.factory.hyprpaper = mappings: { config
-                                             , osConfig
-                                             , lib
-                                             , ...
-                                             }: {
-    services.hyprpaper = assert osConfig.programs.hyprland.enable; {
-      enable = true;
-      settings = {
-        preload = map ({ path, ... }: path) mappings;
-        wallpaper =
-          map
-            ({ monitor
-             , path
-             , prefix ? ""
-             ,
-             }: "${monitor},${prefix}${path}")
-            mappings;
-      };
-    };
-  };
-}

modules/hosts/keith/users/weckyy702/mount-nas.nix

@@ -5,7 +5,7 @@
     imports = with inputs.self.factory; [
       (mount-cifs {
         host = "duke.veltnet";
-        resource = "home";
+        resource = "smb-share";
         destination = "/home/weckyy702/duke";
         credentials_path = "${config.age.secrets.nas-creds.path}";
         UID = "weckyy702";

modules/hosts/keith/users/weckyy702/weckyy702.nix

@@ -3,22 +3,24 @@
     imports = with inputs.self.modules.nixos; [
       weckyy702
       steam
+      mullvad
     ];
 
     home-manager.users.weckyy702 = { config, ... }: {
       imports = with inputs.self.modules.homeManager;
         with inputs.self.factory; [
-          (hyprpaper {
+          (wpaperd {
-            wallpaper_path = "${inputs.assets}/horizontal_16x9.png";
+            default = {
-            monitor_names = [
+              path = "${inputs.assets}/horizontal_16x9.png";
-              "DP-1"
+            };
-              "HDMI-A-1"
-            ];
           })
+
           vesktop
           spicetify
           borgmatic
+
           qbittorrent
+          prusa-slicer
         ];
     };
   };

modules/hosts/tux/devtools.nix

@@ -0,0 +1,15 @@
+{ inputs, ... }: {
+  flake.modules.nixos.tux = {
+    imports = with inputs.self.modules.nixos;
+      with inputs.self.factory; [
+        development-tools
+        rust-dev
+
+        udev
+        udev-pio
+        udev-lauterbach
+
+        docker
+      ];
+  };
+}

modules/hosts/tux/filesystems.nix

@@ -1,18 +1,18 @@
 {
 	flake.modules.nixos.tux = {
   fileSystems."/" =
-		{ device = "/dev/disk/by-uuid/39bb2139-7d71-4f3d-9c11-2cf3fe26ad7d";
+    { device = "/dev/mapper/luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-		{ device = "/dev/disk/by-uuid/6514-61C0";
+    { device = "/dev/disk/by-uuid/15FA-55CF";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-			[ { device = "/dev/disk/by-uuid/ac1606de-34d3-4036-baf6-2ed17e54bfc3"; }
+    [ { device = "/dev/mapper/luks-46e78828-ab23-48b8-8e2a-de7a21adbe24"; }
     ];
 
 

modules/hosts/tux/hardware.nix

@@ -5,11 +5,12 @@
     ];
 
     boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+    boot.initrd.luks.devices."luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a".device = "/dev/disk/by-uuid/9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
+    boot.initrd.luks.devices."luks-46e78828-ab23-48b8-8e2a-de7a21adbe24".device = "/dev/disk/by-uuid/46e78828-ab23-48b8-8e2a-de7a21adbe24";
 
     nixpkgs.hostPlatform = "x86_64-linux";
 
     hardware.enableRedistributableFirmware = true;
     hardware.cpu.intel.updateMicrocode = true;
-
   };
 }

modules/hosts/tux/tux.nix

@@ -4,12 +4,13 @@
       with inputs.self.factory; [
         system-desktop
         systemd-boot
+        bluetooth
+        i18n-de
 
         (autologin "weckyy702")
 
-        development-tools
+        home-vpn
-        i18n-de
+        opentablet
-        tailscale
 
         #TODO: laptop specific aspects like powertop
       ];

modules/hosts/tux/users/weckyy702/bluetooth.nix

@@ -0,0 +1,5 @@
+{ inputs, ... }: {
+  flake.modules.homeManager.blueman-applet = {
+    services.blueman-applet.enable = true;
+  };
+}

modules/hosts/tux/users/weckyy702/docker.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.nixos.tux = {
+    users.users.weckyy702.extraGroups = [ "docker" ];
+  };
+}

modules/hosts/tux/users/weckyy702/hyprland.nix

@@ -1,11 +1,4 @@
 { inputs, ... }: {
-  flake-file.inputs = {
-    aghpb = {
-      url = "github:cat-milk/Anime-Girls-Holding-Programming-Books";
-      flake = false;
-    };
-  };
-
   flake.modules.homeManager.tux-hyprland = {
     imports = with inputs.self.modules.homeManager; [
       ashell

modules/hosts/tux/users/weckyy702/mount-nas.nix

@@ -6,7 +6,7 @@
       (mount-cifs {
         host = "duke.veltnet";
         resource = "smb-share";
-        destination = "/home/weckyy702/duke";
+        destination = "/mnt/nas";
         credentials_path = "${config.age.secrets.nas-creds.path}";
         UID = "weckyy702";
         GID = "users";

modules/hosts/tux/users/weckyy702/wallpaper.nix

@@ -1,14 +1,39 @@
 { inputs, ... }: {
-  flake.modules.homeManager.randomized-aghpb-wallpaper = {
+  flake-file.inputs = {
+    aghpb = {
+      url = "github:cat-milk/Anime-Girls-Holding-Programming-Books";
+      flake = false;
+    };
+    orly-covers = {
+      url = "github:thepracticaldev/orly-full-res";
+      flake = false;
+    };
+  };
+
+  flake.modules.homeManager.randomized-aghpb-wallpaper = { pkgs, ... }:
+    let
+      combined_wallpapers = pkgs.symlinkJoin {
+        name = "joined-wallpapers";
+        paths = with inputs; [
+          aghpb
+          orly-covers
+        ];
+      };
+    in
+    {
       imports = with inputs.self.factory; [
         (wpaperd {
           default = {
-          path = inputs.aghpb;
+            path = combined_wallpapers;
             recursive = true;
             mode = "stretch";
             duration = "5m";
           };
         })
       ];
+
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, i, exec, wpaperctl next"
+      ];
     };
 }

modules/hosts/tux/users/weckyy702/weckyy702.nix

@@ -3,6 +3,7 @@
     imports = with inputs.self.modules.nixos; [
       weckyy702
       upower
+      libreoffice
     ];
 
     home-manager.users.weckyy702 = {
@@ -14,6 +15,7 @@
           tux-hyprland
           randomized-aghpb-wallpaper
           nm-applet
+          blueman-applet
         ];
     };
   };

modules/programs/browser.nix

@@ -6,9 +6,84 @@
     };
   };
 
-  flake.modules.homeManager.browser = { pkgs, ... }: {
+  flake.modules.homeManager.browser =
+    { pkgs
+    , lib
+    , ...
+    }:
+    let
+      mkExtension = shortId: guid: {
+        name = guid;
+        value = {
+          install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
+          installation_mode = "normal_installed";
+        };
+      };
+      zen-pkg =
+        inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped;
+
+      prefs = {
+        "zen.tabs.vertical.right-side" = true;
+        "zen.workspaces.force-container-workspace" = true;
+        "zen.view.compact.enable-at-startup" = true;
+        "zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url" = true;
+        "zen.welcome-screen.seen" = true;
+
+        "sidebar.visibility" = "hide-sidebar";
+
+        "browser.ctrlTab.sortByRecentlyUsed" = true;
+
+        "privacy.fingerprintingProtection" = true;
+        "privacy.globalprivacycontrol.was_ever_enabled" = true;
+        "privacy.sanitize.clearOnShutdown.hasMigratedToNewPrefs3" = true;
+        "privacy.trackingprotection.allow_list.convenience.enabled" = false;
+        "privacy.trackingprotection.allow_list.hasMigratedCategoryPrefs" = true;
+        "privacy.trackingprotection.allow_list.hasUserInteractedWithETPSettings" = true;
+        "privacy.trackingprotection.emailtracking.enabled" = true;
+        "privacy.trackingprotection.enabled" = true;
+        "privacy.trackingprotection.socialtracking.enabled" = true;
+      };
+      extensions = [
+        # To add additional extensions, find it on addons.mozilla.org, find
+        # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
+        # Then go to https://addons.mozilla.org/api/v5/addons/addon/!SHORT_ID!/ to get the guid
+        (mkExtension "ublock-origin" "uBlock0@raymondhill.net")
+        (mkExtension "darkreader" "addon@darkreader.org")
+        (mkExtension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
+        # ...
+      ];
+    in
+    {
       home.packages = [
-      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
+        (
+          pkgs.wrapFirefox zen-pkg
+            {
+              extraPrefs = lib.concatLines (
+                lib.mapAttrsToList
+                  (
+                    name: value: ''lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});''
+                  )
+                  prefs
+              );
+
+              extraPolicies = {
+                DisableTelemetry = true;
+                ExtensionSettings = builtins.listToAttrs extensions;
+
+                SearchEngines = {
+                  Default = "ddg";
+                  Add = [
+                    {
+                      Name = "nixpkgs packages";
+                      URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
+                      IconURL = "https://wiki.nixos.org/favicon.ico";
+                      Alias = "@np";
+                    }
+                  ];
+                };
+              };
+            }
+        )
       ];
     };
 }

modules/programs/catppuccin.nix

@@ -38,11 +38,20 @@
         hyprcursor.size = size;
       };
 
+    wayland.windowManager.hyprland.settings.exec-once = [
+      "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
+    ];
+
     catppuccin.enable = true;
     # Required for QT apps to use the catppuccin colors
     qt = {
       enable = true;
       style.name = "kvantum";
     };
+
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
+    };
   };
 }

modules/programs/development-tools/development-tools.nix

@@ -1,15 +1,15 @@
 { inputs, ... }: {
   flake.modules.nixos.development-tools = { pkgs, ... }: {
-    imports = with inputs.self.modules.nixos; [
-      rust
-    ];
-
     environment.systemPackages = with pkgs; [
       cmake
       gnumake
       clang
       gcc
+
+      man-pages
+      man-pages-posix
     ];
+    documentation.dev.enable = true;
 
     programs.direnv = {
       enable = true;
@@ -17,5 +17,7 @@
       silent = true;
       nix-direnv.enable = true;
     };
+
+    programs.nix-ld.enable = true;
   };
 }

modules/programs/development-tools/rust.nix

@@ -6,7 +6,7 @@
     };
   };
 
-  flake.modules.nixos.rust = { pkgs, ... }: {
+  flake.modules.nixos.rust-dev = { pkgs, ... }: {
     nixpkgs.overlays = [
       inputs.rust-overlay.overlays.default
     ];

modules/programs/development-tools/udev/lauterbach.nix

@@ -0,0 +1,14 @@
+{
+  flake.modules.nixos.udev-lauterbach = {
+    services.udev.extraRules = ''
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0897", SYMLINK+="lauterbach/trace32/%k", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a6e", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a6f", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a70", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a71", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a73", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a75", MODE:="0666"
+      ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a78", MODE:="0666"
+    '';
+  };
+}

modules/programs/development-tools/udev/platformio.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.nixos.udev-pio = { pkgs, ... }: {
+    services.udev.packages = with pkgs; [ platformio-core.udev ];
+  };
+}

modules/programs/development-tools/udev/udev.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.nixos.udev = {
+    services.udev.enable = true;
+  };
+}

modules/programs/docker.nix

@@ -0,0 +1,8 @@
+{
+  flake.modules.nixos.docker = {
+    virtualisation.docker = {
+      enable = true;
+      autoPrune.enable = true;
+    };
+  };
+}

modules/programs/hyprland/settings.nix

@@ -21,10 +21,6 @@
         follow_mouse = 1;
       };
 
-      exec-once = [
-        "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
-      ];
-
       bind =
         [
           "$mod, Q, exit"

modules/programs/libreoffice.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.libreoffice = { pkgs, ... }: {
+    environment.systemPackages = with pkgs; [
+      libreoffice
+    ];
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/default.nix

@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./lsp.nix
+    ./formatter.nix
     ./telescope
     ./cmp
   ];
@@ -20,5 +21,7 @@
     which-key.enable = true;
 
     glow.enable = true;
+
+    fugitive.enable = true;
   };
 }

modules/programs/nixvim/_nixvim-config/plugins/formatter.nix

@@ -0,0 +1,15 @@
+{
+  plugins.conform-nvim = {
+    enable = true;
+    autoInstall.enable = true;
+    settings = {
+      formatters_by_ft = {
+        cpp = [ "clang_format" ];
+        markdown = [
+          "prettier"
+        ];
+      };
+      formatters = { };
+    };
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/lsp.nix

@@ -20,6 +20,9 @@
         enable = true;
       };
       rnix.enable = true;
+
+      basedpyright.enable = true;
+      emmet_ls.enable = true;
     };
 
     keymaps = [

modules/programs/prusa-slicer.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.prusa-slicer = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      prusa-slicer
+    ];
+  };
+}

modules/programs/steam.nix

@@ -8,9 +8,6 @@
       protontricks = {
         enable = true;
       };
-      dedicatedServer.openFirewall = true;
-      localNetworkGameTransfers.openFirewall = true;
-      remotePlay.openFirewall = true;
     };
   };
 }

modules/services/backlight.nix

@@ -2,7 +2,10 @@
   flake.modules.nixos.backlight = {
     programs.light = {
       enable = true;
-      brightnessKeys.enable = true;
+      brightnessKeys = {
+        enable = true;
+        step = 5;
+      };
     };
   };
 }

modules/services/borgmatic.nix

@@ -30,14 +30,10 @@
             patterns = [
               #TODO: home.homeDirectory might be usable here
               #TODO: should be user and machine specific
-              "R /home/${username}/Documents"
+              "R /home/${username}"
-              "R /home/${username}/.ssh"
+              "+ /home/${username}/.ssh"
-              "- /home/${username}/Documents/SteamLibrary"
+              "- /home/${username}/.*"
-              "- /home/${username}/Documents/PrismLauncher instances"
-              "- /home/${username}/Documents/.Trash-1000"
-              "- /home/${username}/Documents/VMs/Data"
               "- **/node_modules"
-              "- **/.git"
               "- **/.cache"
               "- **/*build"
               "- **/target"
@@ -48,6 +44,8 @@
               "- **/dist"
               "- **/.pio"
             ];
+
+            extraConfig.exclude_if_present = [ ".borgignore" ];
           };
           retention.keepWeekly = 2;
           storage.extraConfig.ssh_command = "ssh -i /home/${username}/.ssh/id_ed25519_borg";

modules/services/flameshot.nix

@@ -0,0 +1,12 @@
+{
+  flake.modules.homeManager.flameshot = {
+    services.flameshot = {
+      enable = true;
+      settings = {
+        General = {
+          useGrimAdapter = true;
+        };
+      };
+    };
+  };
+}

modules/services/tailscale.nix

@@ -2,6 +2,8 @@
   flake.modules.nixos.tailscale = {
     services.tailscale = {
       enable = true;
+      # required for using exit nodes
+      useRoutingFeatures = "client";
     };
   };
 }

modules/system-settings/bluetooth.nix

@@ -0,0 +1,9 @@
+{
+  flake.modules.nixos.bluetooth = {
+    hardware.bluetooth = {
+      enable = true;
+    };
+
+    services.blueman.enable = true;
+  };
+}

modules/system-settings/home-vpn.nix

@@ -0,0 +1,14 @@
+{ self, ... }: {
+  flake.modules.nixos.home-vpn = {
+    imports = with self.modules.nixos; [
+      tailscale
+      resolved
+    ];
+
+    services.resolved.extraConfig = ''
+      [Resolve]
+      DNS=10.10.0.1
+      Domains=~veltnet
+    '';
+  };
+}

modules/system-settings/nerdfonts.nix

@@ -8,4 +8,8 @@
       fontDir.enable = true;
     };
   };
+
+  flake.modules.homeManager.nerdfonts = {
+    gtk.font.name = "JetBrainsMono";
+  };
 }

modules/system-settings/opentablet.nix

@@ -0,0 +1,8 @@
+{
+  flake.modules.nixos.opentablet = {
+    hardware.opentabletdriver = {
+      enable = true;
+      daemon.enable = true;
+    };
+  };
+}

modules/system-settings/resolved.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.resolved = {
+    services.resolved.enable = true;
+
+    networking.networkmanager.dns = "systemd-resolved";
+  };
+}

modules/system-types/desktop/desktop.nix

@@ -23,6 +23,7 @@
       multimedia
       zsh
       thunderbird
+      flameshot
     ];
   };
 }

secrets/nas-creds.age

@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFNjTWNPZyB6Mzk1
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFNjTWNPZyBDZVNV
-MWl5cW5uNkc0WTFUTEF1TGFOS0J3a1YyRzJieTlDOGVPbm84WVVNCjJUNlp5K3Ny
+dEhaL21OOUpVeEIyVHY0RHUySldpMkxEMjNrbk5nbWlNRUZrblRvCmEyTnRlNC8r
-YUhMdWp2Zk5tNGp1TkxKcnNST2h1N0VrVnNiaUZzV21QUFUKLT4gc3NoLWVkMjU1
+cldvZGEwS1QvSzdWdGdNSHUrR1N5M1lJcXBpcHZ2RDVMc0UKLT4gc3NoLWVkMjU1
-MTkgZkJwNFR3IDR5UFhoTkNOUlJyVmovMUQzTExGK2Y2bFZPMW9ZZFdQTFliUFVj
+MTkgZkJwNFR3IERiWDkrMEk5MU1vSHB4MmpFbjRMSDhiY3EwVXlrejBHT0h2N2pm
-WDRPM2cKSjFQVWhVZXFMY0ZzdDEraXdkeW1BVkRtemFQdHYzeUI4ZjhrNFdsdmo1
+N0I3MGsKd3RFQ01ObktrNkV5Z1ZsMVFzakVmUXJEczIyV2FVbldCQThCVERQMzJO
-WQotPiBzc2gtZWQyNTUxOSBZazBxSWcgOUJxQkMzYzFrYWhVOTVFTnNvVmI1WDBn
+VQotPiBzc2gtZWQyNTUxOSBZazBxSWcgNjBhL2RldVQ2SWhjL0R2c09jUUY4d01j
-U2ZCVDU0WTliQzRxTVZKdCtCdwpYbUlJVmNHaHpuY0dJMldJSEFkbmpkZTlmTkI1
+RjFjamExWlEvOHlaVUhhQlhURQplRzgxY1pxblZnOXNkZVVEUHN0MVlsRFlQK1hW
-Y3lhQWRBaWdNOGpvcHdzCi0tLSA0dm04SEovSnZ5dW9MaTdxV1NSUGxnZ3orTzNy
+WWVWQ1NwSHM1eUFtRHBvCi0tLSBnL0tvY3JBR3JVaGZVT2NZU2F4SnJlLzE5VUFw
-WUt6eUt6TFAyTGFhdWFVCs0loU4KFs/vYaJX4d31Gf1y8Fv/jWEIALZ4KIqbEPPf
+QU4zM2lsNnRKQkE2blBVCqVEBU+W7CRtMD5OPPvioRttzBk1ZAJSgSiZkJPdVli9
-3C1Ljr2Mbfz231S/zxjfjK2vhHNtYdBtPOsEtpvThCZSTzuJ/WUzox5XUfL7
+Phhr6ZWAr3crBp3Pbn3emLmh+79XdOeAjXI5NhKA2/qW1eSpfClr2rIwu3HX
 -----END AGE ENCRYPTED FILE-----