Update files

2026-10-02 14:27:09 +01:00 · 2026-09-30 17:36:56 +01:00 · 2026-09-29 15:40:53 +01:00 · 2026-09-27 18:44:40 +01:00 · 2026-09-19 17:31:18 +01:00 · 2026-09-08 21:24:27 +01:00
21 changed files with 215 additions and 263 deletions
@@ -25,11 +25,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1781164160,
-        "narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=",
+        "lastModified": 1784365424,
+        "narHash": "sha256-kJO1Tww/GkvLq5amrV4BKidYGr5YumM+cH/xYALAiw4=",
        "owner": "abenz1267",
        "repo": "elephant",
-        "rev": "3296842820d04d5ec774afc7528492fcbb3c01f2",
+        "rev": "23f37238367355cf46843015ad5e94706200176a",
        "type": "github"
      },
      "original": {
@@ -46,11 +46,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1782878575,
-        "narHash": "sha256-sw0B1D//VBGXLQZJXXFLjunnMfO7hCZ5S1kv06BBO5A=",
+        "lastModified": 1788840136,
+        "narHash": "sha256-ej5jnQIfjbw4wwPzy8Y4ntG9F3asdF6YBkLqpYeGUxc=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "e5d8f0375b4613d200e8efd64df2183a75290c4e",
+        "rev": "555b23e68256c5abfb8a85a385231830d1d7ad1f",
        "type": "gitlab"
      },
      "original": {
@@ -81,11 +81,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "lastModified": 1788450739,
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
        "type": "github"
      },
      "original": {
@@ -136,18 +136,17 @@
          "nix-gaming",
          "flake-compat"
        ],
-        "gitignore": "gitignore",
        "nixpkgs": [
          "nix-gaming",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1781733627,
-        "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
        "type": "github"
      },
      "original": {
@@ -156,28 +155,6 @@
        "type": "github"
      }
    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-gaming",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -185,16 +162,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1782704057,
-        "narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=",
+        "lastModified": 1788651960,
+        "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "868d0a692de703c2de98fab61968e4e310b7c28e",
+        "rev": "2c0350c759688177331b8f5242311fae8877bdb3",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "master",
        "repo": "home-manager",
        "type": "github"
      }
@@ -247,11 +224,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1782879690,
-        "narHash": "sha256-pPA8uv71nqPxxsF1wU1m0gnP4+G+pZtfcEIw5Zv8Q20=",
+        "lastModified": 1788839872,
+        "narHash": "sha256-JrJkREqNWmXhTgiXqZQkl6tusimI7fR+a9tu5npmNM0=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "0c07b30bc7bd15014db7154597b34ca12f60398c",
+        "rev": "7b9ddc7b9dc0283e45f616311384b84239a33060",
        "type": "github"
      },
      "original": {
@@ -260,6 +237,25 @@
        "type": "github"
      }
    },
+    "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1788860136,
+        "narHash": "sha256-MhPMOFV4pVkygWEbQ8t1De/uQ9cWF1u++tRe2L5tG48=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "62173785b9a18c78b4a15aca2623d02bceb9d077",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1768661221,
@@ -278,11 +274,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
+        "lastModified": 1788057806,
+        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
+        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
        "type": "github"
      },
      "original": {
@@ -306,18 +302,18 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1782723713,
-        "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
+        "lastModified": 1788807765,
+        "narHash": "sha256-J9oC0bKnkXUrMegqRTXVkyDFJ0gn2U/Qpoo9HgGMQmA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
+        "rev": "93108a538f079596c9a16c72cf03e9322782b6dd",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -356,11 +352,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1782175435,
-        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
+        "lastModified": 1788549839,
+        "narHash": "sha256-kOrCcSIA6w9J1hX5DqHy2k9pDTJymExTsbV74U9UtCA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
+        "rev": "17de0b976395537756f30a3e78f2f06e5cec89ed",
        "type": "github"
      },
      "original": {
@@ -372,27 +368,40 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1782847225,
-        "narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd",
-        "type": "github"
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
      }
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "lastModified": 1788752844,
+        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1783776592,
+        "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
        "type": "github"
      },
      "original": {
@@ -404,14 +413,14 @@
    },
    "psysonic": {
      "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1782918112,
-        "narHash": "sha256-cduzx0wvvEuOGqi4dMbiGMIw7I2R0MxKbTQqxnZjrJU=",
+        "lastModified": 1788894499,
+        "narHash": "sha256-nX9CtRv13tKRC690dhkTDGZ0UtcPWv0x2IKSfFsDnLU=",
        "owner": "Psychotoxical",
        "repo": "psysonic",
-        "rev": "114ad4633f816115b640d41bfe7592732741e6df",
+        "rev": "a41177a09e556467bd1b1baae8dea46f200f6296",
        "type": "github"
      },
      "original": {
@@ -428,11 +437,11 @@
        "home-manager": "home-manager",
        "impermanence": "impermanence",
        "nix-gaming": "nix-gaming",
-        "nixpkgs": "nixpkgs_5",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_6",
+        "nixpkgs-stable": "nixpkgs-stable",
        "psysonic": "psysonic",
        "try-cli": "try-cli",
-        "voxtype": "voxtype",
        "walker": "walker"
      }
    },
@@ -489,11 +498,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1770817563,
-        "narHash": "sha256-REadu3/mf6EHbXofjkYgu/gZ/UBSFOMQ5YhtflwmDNE=",
+        "lastModified": 1786659111,
+        "narHash": "sha256-0uqUVb4B8C94edZSGpmAbpvq8qjuWaV1tyfgP74aK3U=",
        "owner": "tobi",
        "repo": "try-cli",
-        "rev": "f52328af336f7dfa93396069ebcd7152df399010",
+        "rev": "1a0bc444c182aa32c10faef80c7275a93a59519a",
        "type": "github"
      },
      "original": {
@@ -510,11 +519,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1782311621,
-        "narHash": "sha256-K8mog5N+Qv01VyM5n74sOeXCn+2OYgrSZnVDAKQ33zc=",
+        "lastModified": 1788386143,
+        "narHash": "sha256-XxHvtiWSYRhCzH82/sxbdg4Iai6fmmLn9PShdgZxZzo=",
        "owner": "peteonrails",
        "repo": "voxtype",
-        "rev": "31b7f38c4e22c4ce75d6350945729e5db001cb9a",
+        "rev": "e32510690636d1e082f2f02a5094efda4aa95fa0",
        "type": "github"
      },
      "original": {
@@ -534,11 +543,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1781164128,
-        "narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=",
+        "lastModified": 1784217994,
+        "narHash": "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=",
        "owner": "abenz1267",
        "repo": "walker",
-        "rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb",
+        "rev": "42b3ed88abf50bc52638fb2835b7f17e3ea3ac4c",
        "type": "github"
      },
      "original": {
@@ -1,30 +1,15 @@
 {
    description = "Stationette nix config";

-    nixConfig = {
-        extra-substituters = [
-            "https://nix-gaming.cachix.org"
-            "https://walker.cachix.org"
-            "https://walker-git.cachix.org"
-            "https://psysonic.cachix.org"
-        ];
-        extra-trusted-public-keys = [
-            "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-            "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
-            "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
-            "psysonic.cachix.org-1:M9cQyQ7tgvUWOQ5Pyt8ozlMoPLtOZir6MfRuTH9/VYA="
-        ];
-    };
-
    inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
-        nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+        nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
        nix-gaming.url = "github:fufexan/nix-gaming";
        disko.url = "github:nix-community/disko/latest";
        impermanence.url = "github:nix-community/impermanence";
        nixos-hardware.url = "github:NixOS/nixos-hardware/master";
        home-manager = {
-            url = "github:nix-community/home-manager/release-26.05";
+            url = "github:nix-community/home-manager/master";
            inputs.nixpkgs.follows = "nixpkgs";
        };
        firefox-addons = {
@@ -33,7 +18,6 @@
        };
        psysonic = {
            url = "github:Psychotoxical/psysonic";
-            # inputs.nixpkgs.follows = "nixpkgs"; # psysonic needs rustc 1.95+, nixos-25.11 only has 1.91
        };
        try-cli = {
            url = "github:tobi/try-cli";
@@ -41,35 +25,22 @@
        };
        elephant = {
            url = "github:abenz1267/elephant";
-            # inputs.nixpkgs.follows = "nixpkgs";
        };
        walker = {
            url = "github:abenz1267/walker";
            inputs.elephant.follows = "elephant";
            inputs.nixpkgs.follows = "nixpkgs";
        };
-        voxtype = {
-            url = "github:peteonrails/voxtype";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-        # hyprland-preview-share-picker = {
-        #     url = "github:WhySoBad/hyprland-preview-share-picker";
-        #     inputs.nixpkgs.follows = "nixpkgs";
-        # };
    };

    outputs = {
        self,
        nixpkgs,
-        nixpkgs-unstable,
+        nixpkgs-stable,
        nix-gaming,
        impermanence,
        disko,
        home-manager,
-        try-cli,
-        psysonic,
-        voxtype,
-        walker,
        nixos-hardware,
        # hyprland-preview-share-picker,
        ...
@@ -80,11 +51,11 @@
            inherit system;
            config.allowUnfree = true;
        };
-        nix-gaming = inputs.nix-gaming.packages.${system};
-        pkgs-unstable = import nixpkgs-unstable {
+        pkgs-stable = import nixpkgs-stable {
            inherit system;
            config.allowUnfree = true;
        };
+        nix-gaming = inputs.nix-gaming.packages.${system};

        mkHost = hostname: nixpkgs.lib.nixosSystem {
            modules = [
@@ -99,11 +70,7 @@
                        users.chris = import ./home;
                        extraSpecialArgs = {
                            inherit inputs;
-                            inherit pkgs-unstable;
-                            inherit try-cli;
-                            inherit psysonic;
-                            inherit voxtype;
-                            inherit walker;
+                            inherit pkgs-stable;
                            inherit impermanence;
                            inherit hostname;
                        };
@@ -112,7 +79,7 @@
            ];
            specialArgs = {
                inherit inputs;
-                inherit pkgs-unstable;
+                inherit pkgs-stable;
                inherit impermanence;
                inherit disko;
                inherit hostname;
@@ -131,11 +98,7 @@
                inherit pkgs;
                extraSpecialArgs = {
                    inherit inputs;
-                    inherit pkgs-unstable;
-                    inherit try-cli;
-                    inherit psysonic;
-                    inherit voxtype;
-                    inherit walker;
+                    inherit pkgs-stable;
                    inherit impermanence;
                };
                modules = [
@@ -4,19 +4,4 @@
    imports = [
        ./nas-mounts.nix
    ];
-
-    # fileSystems = {
-    #     "/home/chris/Games" = {
-    #         device = "/dev/disk/by-label/Games";
-    #         fsType = "ext4";
-    #         options = [ 
-    #             "defaults"
-    #             "x-systemd.mount-timeout=5"
-    #             "user"
-    #             "exec"
-    #             "x-systemd.automount"
-    #             "noauto"
-    #         ];
-    #     };
-    # };
 }
@@ -76,28 +76,4 @@
            "text/xml" = [ "nvim.desktop" ];
        };
    };
-    # systemd.user = {
-    #     enable = true;
-    #     timers = {
-    #         "station-battery-monitor" = {
-    #             wantedBy = [ "timers.target" ];
-    #             timerConfig = {
-    #                 OnBootSec = "1min";
-    #                 OnUnitActiveSec = "30sec";
-    #                 Unit = "station-battery-monitor.service";
-    #             };
-    #         };
-    #     };
-    #     services = {
-    #         "station-battery-monitor" = {
-    #             after = [ "graphical-session.target" ];
-    #             serviceConfig = {
-    #                 Type = "oneshot";
-    #                 ExecStart = "%h/.local/share/omarchy/bin/omarchy-battery-monitor";
-    #                 Environment = "DISPLAY=:0";
-    #                 LogLevelMax = "warning";
-    #             };
-    #         };
-    #     };
-    # };
 }
@@ -4,17 +4,21 @@
    #imports = [ impermanence.nixosModules.impermanence ];
    home.persistence."/persist" = {
        directories = [
+            ".cache/node"
+            ".cache/Moonlight Game Streaming Project"
            ".cache/Nextcloud"
            ".cache/wal"
            ".cache/zsh"
            ".config/.gemini"
            ".config/Antigravity"
+            ".config/Bitwarden"
            ".config/Nextcloud"
            ".config/chromium"
            ".config/dotfiles"
            ".config/nixos"
            ".config/Signal"
            ".config/nvim"
+            ".config/Moonlight Game Streaming Project"
            ".config/obsidian"
            ".config/sinew.in"
            ".config/spotify"
@@ -33,13 +37,13 @@
            ".local/share/Libation"
            ".local/share/nvim"
            ".local/share/station"
-            ".local/share/voxtype"
            ".local/share/zoxide"
            ".local/state/station"
            ".local/state/wireplumber"
            ".mozilla/firefox"
            ".ssh"
            ".gemini"
+            ".ollama"
            ".steam"
            ".minecraft"
            "Code"
@@ -1,7 +1,7 @@
-{ pkgs, pkgs-unstable, try-cli, psysonic, nix-direnv, ... }:
+{ pkgs, pkgs-stable, inputs, nix-direnv, ... }:

 let
-# krita-appimage = pkgs.callPackage ../packages/krita.nix { };
+krita-appimage = pkgs.callPackage ../packages/krita.nix { };
 enpass = pkgs.enpass.overrideAttrs (oldAttrs: rec {
    version = "6.11.13.1957";
    src = pkgs.fetchurl {
@@ -24,39 +24,38 @@ in
        };
    };
    home.packages = with pkgs; [
-        pkgs-unstable.antigravity # Gemini AI coding assistant
-        pkgs-unstable.antigravity-cli # Gemini AI coding assistant
+        antigravity-cli # Gemini AI coding assistant
+        rbw # Bitwarden CLI
+        pinentry-all
+        wl-clipboard
+        wtype
+        bitwarden-desktop
        bluetui # Bluetooth TUI
        enpass # Password manager
-        enpass-cli # Enpass CLI tool
        expressvpn # VPN
        ffmpeg # Video tools
        ffmpegthumbnailer # Video thumbnailer
-        pkgs-unstable.gemini-cli # Gemini AI CLI tool
        ghostty # Terminal emulator
        gimp # Image manipulation software
        gpu-screen-recorder # GPU screen recorder for Linux
        imv # Image viewer
        inkscape # Vector graphics software
-        pkgs-unstable.krita # Custom digital art software (from AppImage)
-        # pkgs-unstable.libation # Audible book manager
-        libreoffice-fresh # Office suite
-        pkgs-unstable.atlauncher # Minecraft launcher
+        krita-appimage # Custom digital art software (from AppImage)
+        libreoffice-stable # Office suite
+        moonlight-qt # Game streaming client
        mpv # Video player
        nautilus # Document viewer
-        nextcloud-client # Nextcloud sync client
-        obsidian # Notes software
-        psysonic.packages.${pkgs.system}.default # Music player
+        pkgs-stable.nextcloud-client # Nextcloud sync client
+        inputs.psysonic.packages.${pkgs.stdenv.hostPlatform.system}.default # Music player
        signal-desktop # Messaging
        spotify # Music
        super-productivity # Task app
        sxiv # Minimal image viewer
        tenacity # Audio software
        thunderbird # Mail client
-        try-cli.packages.${pkgs.system}.default # Try CLI tool
+        inputs.try-cli.packages.${pkgs.stdenv.hostPlatform.system}.default # Try CLI tool
        wally-cli # Keyboard flasher
        wiremix # Audio mixer TUI
-        xournalpp # Handwriting note-taking software
        yad # For creating dialogs during install script
        zenity # For creating dialogs during install script
        zathura # Minimal PDF viewer
@@ -65,7 +64,7 @@ in
        force = true;
        text = ''
 {
-    "workspace.library": ["${pkgs-unstable.hyprland}/share/hypr/stubs"]
+    "workspace.library": ["${pkgs.hyprland}/share/hypr/stubs"]
 }
        '';
    };
@@ -77,23 +76,16 @@ in
            categories = [ "Utility" ];
            icon = "libation";
        };
+        krita = {
+            name = "Krita";
+            exec = "env QT_QPA_PLATFORM=xcb QT_SCALE_FACTOR=2 krita-appimage %F";
+            icon = "krita";
+            genericName = "Digital Painting";
+            mimeType = ["application/x-krita"];
+            comment = "Digital Painting";
+            type = "Application";
+            categories = ["Qt" "KDE" "Graphics"  "2DGraphics" "RasterGraphics"];
+            terminal = false;
+        };
    };
-    # xdg.desktopEntries.enpass = {
-    #     type = "Application";
-    #     name = "Enpass";
-    #     genericName = "Enpass Password Manager";
-    #     icon = "enpass";
-    #     terminal = false;
-    #     exec = "env QT_SCREEN_SCALE_FACTORS=2 ${enpass}/bin/Enpass %U";
-    #     mimeType = [
-    #         "x-scheme-handler/enpassauth"
-    #         "x-scheme-handler/enpasscard"
-    #         "x-scheme-handler/enpassstart"
-    #         "x-scheme-handler/enpass"
-    #         "x-scheme-handler/cloudkit-7adb8cc64f.in.sinew.walletx"
-    #         "x-scheme-handler/enpassshare"
-    #         "application/enpasscard"
-    #     ];
-    #     categories = [ "Utility" ];
-    # };
 }
@@ -1,9 +1,8 @@
-{ pkgs, lib, voxtype, walker, ... }:
+{ pkgs, lib, inputs, ... }:

 {
    imports = [
-        walker.homeManagerModules.default
-        voxtype.homeManagerModules.default
+        inputs.walker.homeManagerModules.default
    ];
    programs = let
        lock-false = {
@@ -31,17 +30,10 @@
            enable = true;
            systemd.enable = true;
        };
-        voxtype = {
-            enable = true;
-            package = voxtype.packages.${pkgs.system}.vulkan;
-            service.enable = true;
-            settings = {};
-        };
        chromium = {
            enable = true;
            extensions = [
                "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-                "kmcfomidfpdkfieipokbalgegidffkal" # Enpass
            ];
        };
        firefox = {
@@ -66,17 +58,6 @@
                    DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
                        DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
                        SearchBar = "unified"; # alternative: "separate"
-
-                        /* ---- EXTENSIONS ---- */
-                        ExtensionSettings = {
-                            "*".installation_mode = "allowed"; # blocks all addons except the ones specified below
-                                # Enpass
-                                "firefox-enpass@enpass.io" = {
-                                    install_url = "https://dl.enpass.io/stable/extensions/firefox/versions/v6.11.10.2/enpass_password_manager-6.11.10.2.xpi";
-                                    installation_mode = "force_installed";
-                                };
-                        };
-
                    /* ---- PREFERENCES ---- */
                    Preferences = { 
                        "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; };
@@ -131,6 +112,5 @@
            };
        };
    };
-    xdg.configFile."voxtype/config.toml".enable = false;
    home.file.".icons/default".source = "${pkgs.vimix-cursors}/share/icons/Vimix-white-cursors";
 }
@@ -3,6 +3,10 @@
 {
    services = {
        swayosd.enable = true;
+        ollama = {
+            enable = true;
+            package = pkgs.ollama;
+        };
        darkman = {
            enable = true;
            settings = {
@@ -6,12 +6,14 @@
 }:

 let
-    version = "6.0.1";
+    version = "6.0.3";
    pname = "krita-appimage";

    src = fetchurl {
        url = "https://download.kde.org/stable/krita/${version}/krita-${version}-x86_64.AppImage";
-        hash = "sha256-lzIgaqZiTnUOW5FSRF+1ROpj3RASWC390aLVFSBBTQo=";
+        # Calculate this for each version with the following: nix store prefetch-file --hash-type sha256 "https://download.kde.org/stable/krita/6.0.3/krita-6.0.3-x86_64.AppImage"
+
+        hash = "sha256-xeExFExqU94O2KMkQNh8/RseoeqrZVCdbYGHeX0+KbM=";
    };

    appimageContents = appimageTools.extract { inherit pname version src; };
@@ -1 +0,0 @@
-/nix/store/ldv0r3wrdz10h7q483hym4s5jajnmgs2-psysonic-1.50.0-dev
@@ -14,6 +14,7 @@ in
        loader = {
            limine = {
                enable = true;
+                maxGenerations = 4;

                extraConfig = ''
                    timeout: 3
@@ -38,15 +39,15 @@ in
            # timeout = 0; # Skips the menu and uses default entry
        };
        # Creates a cool animation for booting
-        plymouth = {
-            enable = true;
-            theme = "black_hud";
-            themePackages = with pkgs; [
-                (adi1090x-plymouth-themes.override {
-                    selected_themes = [ "black_hud" ];
-                })
-            ];
-        };
+        # plymouth = {
+        #     enable = true;
+        #     theme = "black_hud";
+        #     themePackages = with pkgs; [
+        #         (adi1090x-plymouth-themes.override {
+        #             selected_themes = [ "black_hud" ];
+        #         })
+        #     ];
+        # };
        initrd.verbose = false;

        kernelParams = [
@@ -55,8 +56,9 @@ in
            "udev.log_level=3"
            "systemd.show_status=auto"
            "splash"
+            "video=DP-1:3840x2160@60"
+            "video=DP-2:3840x2160@60"
        ];
-        bootspec.enable = true;
        resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root";
        kernel.sysctl = {
            "net.ipv4.ip_unprivileged_port_start" = 0;
@@ -69,6 +71,9 @@ in
                DefaultTimeoutStopSec = "5s";
            };
        };
+        services.systemd-suspend.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
+        services.systemd-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
+        services.systemd-suspend-then-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
    };
 }

@@ -1,4 +1,4 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:

 {
    hardware = {
@@ -11,7 +11,7 @@

        opentabletdriver = {
            enable = true;
-            package = pkgs-unstable.opentabletdriver;
+            package = pkgs.opentabletdriver;
        };
        uinput.enable = true;
    };
@@ -9,6 +9,7 @@
        directories = [
            "/var/log"
            "/var/lib/bluetooth"
+            "/var/lib/iwd"
            "/var/lib/networkmanager"
            "/var/lib/docker"
            "/var/lib/nixos"
@@ -72,6 +72,8 @@
                "office.scarif.space"
                "radio.scarif.space"
                "rec.scarif.space"
+                "holo.scarif.space"
+                "media.scarif.space"
                "scarif.space"
            ];
        };
@@ -1,14 +1,11 @@
-{ pkgs, pkgs-unstable, nix-gaming, ... }:
+{ pkgs, nix-gaming, ... }:

 {
    nixpkgs.config.allowUnfree = true;
    environment.systemPackages = with pkgs; [
-        # hyprland-preview-share-picker.packages.${system}.default # Hyprland share picker TODO: Figure out and configure
        bat # Better cat
        brightnessctl # Backlight control
        btop # Resource monitor
-        cargo # Rust build tool
-        clippy # Rust linter
        eza # Better ls
        fcitx5 # Input method framework TODO: Figure out and configure
        fzf # Fuzzy file finder
@@ -20,35 +17,31 @@
        gum # Terminal UI tool
        highlight # Syntax highlighting tool TODO: Hook up to ZSH
        hyprcursor # Hyprland cursor theme support
-        hyprsunset # Blue light filter
        hypridle # Idle daemon for Hyprland
        hyprlock # Screen locker for Hyprland
-        hyprpaper # Wallpaper utility for Hyprland TODO: Check if necessary with swaybg
        hyprpicker # Hyprland colour picker
        imagemagick # Image manipulation tool
        impala # Wifi TUI
        jq # CLI JSON processor
+        killall # Needed by some programs
        lazygit # Git TUI
        less # Pager
        libnotify # Notification daemon
        localsend # Local file sharing tool
        makima # Key remapper for Linux TODO: Figure out and configure
        mako # Notification daemon
-        pkgs-unstable.neovim # Editor
-        nix-gaming.mo2installer
+        neovim # Editor
        pnpm # JavaScript package manager (used by Neovim plugins)
        tree-sitter # Incremental parsing tool for editors
        nodejs_24 # JavaScript runtime
        openssl # SSL/TLS toolkit
        p7zip # 7-Zip archiver
        pipewire
-        pkgs-unstable.yazi # Terminal file manager
+        yazi # Terminal file manager
        pywal16 # Image colorscheme generator
        qt6.qtwayland # qtwayland support
        ripgrep # Better grep
        rsync # Remote file sync
-        rustc # Rust compiler
-        rustfmt # Rust formatter
        satty # Screenshot editor TODO: Figure out and configure
        seahorse # GNOME Keyring manager
        sshpass # SSH with password in CLI, used by install scripts
@@ -62,12 +55,11 @@
        v4l-utils # Video4Linux utilities TODO: Figure out why I need this
        waybar # Status bar for Hyprland
        wget # Download tool
-        pkgs-unstable.wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
-        pkgs-unstable.winetricks # Windows compatibility tool
+        wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
+        winetricks # Windows compatibility tool
        wl-clipboard # Wayland clipboard manager
        wlogout # Wayland logout menu
        xdg-terminal-exec # XDG terminal execution utility
-        # yarn-berry # JavaScript package manager
        yarn # JavaScript package manager
        zip # Archiver tool
        zoxide # Better cd
@@ -88,6 +80,7 @@
    };

    nix.settings = {
+        trusted-users = [ "root" "chris" ];
        extra-substituters = [
            "https://nix-gaming.cachix.org"
            "https://walker.cachix.org"
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, hostname, ... }:
+{ pkgs, hostname, ... }:

 {
    programs = {
@@ -13,14 +13,14 @@
        };
        hyprland = {
            enable = true;
-            package = pkgs-unstable.hyprland;
-            portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland;
+            package = pkgs.hyprland;
+            portalPackage = pkgs.xdg-desktop-portal-hyprland;
            xwayland.enable = true;
            withUWSM = true;
        };
        steam = {
            enable = true;
-            package = pkgs-unstable.steam;
+            package = pkgs.steam;
            remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
            dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
            localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
@@ -1,4 +1,4 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:

 {
    services = {
@@ -10,7 +10,7 @@
        fwupd.enable = true;
        input-remapper = {
            enable = true;
-            package = pkgs-unstable.input-remapper;
+            package = pkgs.input-remapper;
        };
        geoclue2 = {
            enable = true;
@@ -32,7 +32,7 @@
                enable = true;
                wayland.enable = true;
                theme = "maya";
-                package = pkgs-unstable.kdePackages.sddm;
+                package = pkgs.kdePackages.sddm;
            };
            autoLogin.enable = true;
            autoLogin.user = "chris";
@@ -41,6 +41,13 @@
        gnome.gnome-keyring.enable = true;

        hardware.bolt.enable = true;
+        logind = {
+            enable = true;
+            settings.Login = {
+                HandleLidSwitch = "suspend";
+                HandleLidSwitchDocked = "ignore";
+            };
+        };
    };
    security.pam.services.sddm.enableGnomeKeyring = true;
 }
@@ -7,5 +7,35 @@
        alsa.support32Bit = true;
        pulse.enable = true;
        jack.enable = true;
+
+        wireplumber.extraConfig."99-default-audio" = {
+            "monitor.alsa.rules" = [
+                {
+                    matches = [
+                        {
+                            "device.name" = "alsa_card.usb-ACTIONS_Pebble_V3-00";
+                        }
+                    ];
+                    actions = {
+                        update-props = {
+                            "api.alsa.soft-mixer" = true;
+                        };
+                    };
+                }
+                {
+                    matches = [
+                        {
+                            "node.name" = "alsa_output.usb-ACTIONS_Pebble_V3-00.analog-stereo";
+                        }
+                    ];
+                    actions = {
+                        update-props = {
+                            "priority.driver" = 2000;
+                            "priority.sessions" = 2000;
+                        };
+                    };
+                }
+            ];
+        };
    };
 }
@@ -8,6 +8,7 @@
        shell = pkgs.zsh;
        extraGroups = [
            "chris"
+            "kvm"
            "wheel"
            "networkmanager"
            "docker"
@@ -1,11 +1,11 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:

 {
    virtualisation = {
        docker = {
            enable = true;
            autoPrune.enable = true;
-            package = pkgs-unstable.docker;
+            package = pkgs.docker;
        };
    };
 }
Author	SHA1	Message	Date
chris	dfa0f5029f	Update files	2026-10-02 14:27:09 +01:00
chris	d564d4caa1	Update files	2026-09-30 17:36:56 +01:00
chris	0ac1d3d6b8	Update files	2026-09-29 15:40:53 +01:00
chris	655b2fa121	Update files	2026-09-27 18:44:40 +01:00
chris	ad994a6bf7	Update files	2026-09-19 17:31:18 +01:00
chris	6633578cd6	Stuff	2026-09-08 21:24:27 +01:00
chris	d4078cdc55	Update files	2026-09-02 11:08:41 +01:00
chris	8cadd05910	Use krita app image	2026-09-01 22:29:58 +01:00
chris	f50bfde69d	Try to fix volume issue	2026-08-31 22:16:00 +01:00
chris	62f1606194	Update files	2026-08-25 21:34:36 +01:00
chris	e2d71e18cc	Update files	2026-08-21 23:27:08 +01:00
chris	38b144f791	Update files	2026-08-21 23:26:49 +01:00
chris	dc6ba6a82d	Update files	2026-08-21 23:26:28 +01:00
chris	152a3c192e	Update	2026-08-17 21:08:56 +01:00
chris	bf35d77d66	Downgrade nextcloud	2026-08-17 21:02:43 +01:00
chris	c6edd6533f	Update files	2026-08-16 19:36:05 +01:00
chris	c0a01e2d66	Update files	2026-08-16 18:56:29 +01:00
chris	5255ce3709	Cleaning up and fixing	2026-08-16 12:36:59 +01:00
chris	7982e77c12	Update	2026-08-15 21:21:16 +01:00
				`@@ -1 +0,0 @@`
				`/nix/store/ldv0r3wrdz10h7q483hym4s5jajnmgs2-psysonic-1.50.0-dev`