merge

2025-06-30 00:01:06 +01:00
parent dbbfc3d8ff ed349bd4e6
commit 739518cdac
24 changed files with 1216 additions and 137 deletions
--- a/.flake.lock.swp
+++ b/.flake.lock.swp
--- a/.flake_BASE_10015.lock.swp
+++ b/.flake_BASE_10015.lock.swp
--- a/.flake_LOCAL_10015.lock.swp
+++ b/.flake_LOCAL_10015.lock.swp
--- a/.flake_REMOTE_10015.lock.swp
+++ b/.flake_REMOTE_10015.lock.swp
--- a/configuration/base.nix
+++ b/configuration/base.nix
@@ -51,6 +51,30 @@
  services.pipewire = {
    enable = true;
    pulse.enable = true;
+    extraConfig.pipewire-pulse = {
+      "10-prevent-agc" = {
+        "pulse.rules" = [
+          {
+            matches = [
+              { "application.process.binary" = "chrome"; }
+              { "application.process.binary" = "Discord"; }
+              { "application.process.binary" = "teams"; }
+              { "application.process.binary" = "electron"; }
+              { "application.process.binary" = "skypeforlinux"; }
+              { "application.process.binary" = "telegram-desktop"; }
+              { "application.process.binary" = "vivaldi"; }
+              { "application.process.binary" = "chromium"; }
+              { "application.process.binary" = "zoom"; }
+            ];
+            actions = {
+              quirks = [
+                "block-source-volume"
+              ];
+            };
+          }
+        ];
+      };
+    };
  };

  services.fstrim.enable = true;
@@ -67,11 +91,15 @@
  };
  services.flatpak.enable = true;

+  programs.bash.blesh.enable = true;
+  programs.fish.enable = true;
+
  # List packages installed in system profile. To search, run:
  # $ nix search wget
  environment.systemPackages = with pkgs;
    [
      # utils
+      uutils-coreutils-noprefix
      vim
      curl
      inetutils
--- a/configuration/base/fonts.nix
+++ b/configuration/base/fonts.nix
@@ -1,12 +1,15 @@
 { pkgs, ... }:

 {
-  fonts.enableDefaultPackages = true;
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-cjk-serif
-  ];
+  fonts = {
+    enableDefaultPackages = true;
+    fontconfig.useEmbeddedBitmaps = true;
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
+    ];
+  };

  # Select internationalisation properties.
  i18n = {
--- a/configuration/modules/gaming.nix
+++ b/configuration/modules/gaming.nix
@@ -4,18 +4,36 @@
  hardware.graphics.enable32Bit = true; # For 32 bit applications
  hardware.steam-hardware.enable = true;

+  programs.gamemode.enable = true;
+  programs.gamescope = {
+    enable = true;
+    # capSysNice = true;
+    # args = [
+    #   "-H 1080"
+    # ];
+  };
  programs.steam = {
    enable = true;
    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-    #gamescopeSession.enable = true;
+    gamescopeSession.enable = true;
    protontricks.enable = true;
    extraCompatPackages = [ pkgs.proton-ge-bin ];
+    package = pkgs.steam.override {
+      extraPkgs = pkgs': with pkgs'; [
+        xorg.libXcursor
+        xorg.libXi
+        xorg.libXinerama
+        xorg.libXScrnSaver
+        libpng
+        libpulseaudio
+        libvorbis
+        stdenv.cc.cc.lib # Provides libstdc++.so.6
+        libkrb5
+        keyutils
+      ];
+    };
  };
-  programs.gamemode.enable = true;
-  programs.gamescope.enable = true;

-  # ensure users who need access to this have `cdrom` as `extraGroups`
-  # Wait for https://github.com/NixOS/nixpkgs/pull/397358 to be in stable to reenable
-  programs.cdemu.enable = true;
+  programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work
 }
--- a/devices/starlite/configuration.nix
+++ b/devices/starlite/configuration.nix
@@ -29,6 +29,9 @@
  home-manager.useGlobalPkgs = true;
  home-manager = {
    extraSpecialArgs = { inherit inputs; };
+    sharedModules = [
+      inputs.nix-index-database.hmModules.nix-index
+    ];
    users = {
      "worble" = import ./home.nix;
    };
--- a/devices/tuxedo/configuration.nix
+++ b/devices/tuxedo/configuration.nix
@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).

-{ inputs, ... }:
+{ inputs, pkgs, ... }:

 {
  imports =
@@ -20,6 +20,18 @@

  networking.hostName = "tuxedo"; # Define your hostname.

+  # one day i will fix the fullscreen issue
+  # https://community.frame.work/t/fullscreen-games-freeze-on-plasma-6-with-dgpu/61088/9
+  # https://community.frame.work/t/bug-psa-gpu-bug-causes-crashes-on-kde-plasma/58133/4
+  # https://www.reddit.com/r/archlinux/comments/1gzy0xd/amdgpu_regression_on_kernel_612_choppy/
+  # https://forum.manjaro.org/t/unstable-update-october-2024-edition/168715/44
+  boot.kernelParams = [
+    # "amdgpu.dcdebugmask=0x410"
+    # or amdgpu.dcdebugmask=0x010
+    # or amdgpu.dcdebugmask=0x400
+    # or both amdgpu.dcdebugmask=0x410
+  ];
+
  boot.extraModprobeConfig = ''
    options iwlwifi 11n_disable=8 power_save=0
    options iwlmvm power_scheme=1
@@ -40,22 +52,32 @@
    ];
  };

-  hardware.tuxedo-drivers.enable = true;
+  # hardware.tuxedo-drivers.enable = true;

-  programs.nix-ld.enable = true;
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+    dumpcap.enable = true;
+  };
+
+  environment.systemPackages = with pkgs;[
+    distrobox
+  ];

  # Define a user account. Don't forget to set a password with ‘passwd’.
  users.users.worble = {
    initialPassword = "password";
    isNormalUser = true;
-    extraGroups = [ "wheel" "gamemode" "docker" "cdrom" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "gamemode" "docker" "cdrom" "wireshark" ]; # Enable ‘sudo’ for the user.
    linger = true;
  };

  home-manager = {
    useGlobalPkgs = true;
    extraSpecialArgs = { inherit inputs; };
-    sharedModules = [ ];
+    sharedModules = [
+      inputs.nix-index-database.hmModules.nix-index
+    ];
    users = {
      "worble" = import ./home.nix;
    };
--- a/devices/tuxedo/home.nix
+++ b/devices/tuxedo/home.nix
@@ -29,6 +29,7 @@

    # comms   
    teams-for-linux
+    teamspeak6-client

    # media
    jellyfin-media-player
@@ -76,9 +77,11 @@
      config = {
        profile = "gpu-hq";
        vo = "gpu-next";
-        gpu-api = "vulkan";
+        gpu-api = "opengl";
+        gpu-context = "wayland";
        hwdec = "vulkan";
        screenshot-directory = "/mnt/HDD1/Pictures/";
+        # screenshot-directory = "~/Pictures/";
        screenshot-template = "%F/%F_snapshot_%P";
        glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl";
      };
@@ -113,6 +116,8 @@
        Unit = {
          Description = "rclone-media /mnt/HDD1/Videos/";
          After = [ "network.target" "mnt-HDD1.mount" ];
+          # Maybe? https://unix.stackexchange.com/questions/281650/systemd-unit-requiresmountsfor-vs-conditionpathisdirectory
+          # RequiresMountsFor = "/mnt/HDD1/Videos/";
        };

        Install = {
@@ -120,6 +125,8 @@
        };

        Service = {
+          RestartSec = 10;
+          Restart = "on-failure";
          Type = "exec";
          ExecStart = "${pkgs.writeShellApplication {
 name = "rclone-media";
--- a/fix-nix.sh
+++ b/fix-nix.sh
@@ -0,0 +1,3 @@
+# Occasionally the nix store can get into a tizz and all updates will fail
+# This should fix that
+sudo nix-store --repair --verify --check-contents
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745812220,
-        "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
+        "lastModified": 1750040002,
+        "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
+        "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
        "type": "github"
      },
      "original": {
@@ -45,20 +45,40 @@
        ]
      },
      "locked": {
-        "lastModified": 1745557122,
-        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749960154,
+        "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "424a40050cdc5f494ec45e46462d288f08c64475",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
    "nix-system-graphics": {
      "inputs": {
        "nixpkgs": [
@@ -85,11 +105,19 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
+<<<<<<< HEAD
        "lastModified": 1745978191,
        "narHash": "sha256-DC9GhExyUbJKbBMgs+YA4fuUzOqUPuA6pR0mDI3MELk=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
        "rev": "72da67da783674ef82032f4d5bcf686a7ccd8776",
+=======
+        "lastModified": 1750039657,
+        "narHash": "sha256-Vrh5PDskpJ2kEumHbncffZxWQGr2pK88oTOFtBUWG74=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "54ce2a0e930383535c632aad39b22205fa430be0",
+>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
        "type": "github"
      },
      "original": {
@@ -100,11 +128,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1745955289,
-        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
+        "lastModified": 1750083401,
+        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
+        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
        "type": "github"
      },
      "original": {
@@ -132,11 +160,19 @@
    },
    "nixpkgs-unstable": {
      "locked": {
+<<<<<<< HEAD
        "lastModified": 1745930157,
        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+=======
+        "lastModified": 1749794982,
+        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
        "type": "github"
      },
      "original": {
@@ -148,16 +184,24 @@
    },
    "nixpkgs_2": {
      "locked": {
+<<<<<<< HEAD
        "lastModified": 1745921652,
        "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
+=======
+        "lastModified": 1750005367,
+        "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
+>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -166,6 +210,7 @@
      "inputs": {
        "disko": "disko",
        "home-manager": "home-manager",
+        "nix-index-database": "nix-index-database",
        "nix-system-graphics": "nix-system-graphics",
        "nix-vscode-extensions": "nix-vscode-extensions",
        "nixos-hardware": "nixos-hardware",
@@ -181,11 +226,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744139528,
-        "narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=",
+        "lastModified": 1748252092,
+        "narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=",
        "owner": "numtide",
        "repo": "system-manager",
-        "rev": "803322102ed51f29c250d4bff2973625adc4a521",
+        "rev": "c6850451ef769fd03d0ad5474f928b916aa23775",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,26 @@
 {
  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11?shallow=1";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1";
-    nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?shallow=1";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name]
+
    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11?shallow=1";
+      url = "github:nix-community/home-manager/release-25.05?shallow=1";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database?shallow=1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1";
    disko = {
      url = "github:nix-community/disko?shallow=1";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+
+    nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?shallow=1";
+
    system-manager = {
      url = "github:numtide/system-manager?shallow=1";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -22,7 +31,7 @@
    };
  };

-  outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, ... }@inputs:
+  outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, ... }@inputs:
    let
      system = "x86_64-linux";
      pkgs = import nixpkgs {
@@ -47,7 +56,10 @@
      packages.${system}.homeConfigurations.deck = home-manager.lib.homeManagerConfiguration {
        inherit pkgs;
        extraSpecialArgs = { inherit inputs; };
-        modules = [ ./devices/deck/home.nix ];
+        modules = [
+          nix-index-database.hmModules.nix-index
+          ./devices/deck/home.nix
+        ];
      };
      systemConfigs.deck = system-manager.lib.makeSystemConfig {
        modules = [
--- a/flake_BACKUP_10015.lock
+++ b/flake_BACKUP_10015.lock
@@ -0,0 +1,260 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750040002,
+        "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749960154,
+        "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "424a40050cdc5f494ec45e46462d288f08c64475",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
+    "nix-system-graphics": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737457219,
+        "narHash": "sha256-nX9dxoATDCSQgWw/iv6BngXDJEyHVYYEvHEVQ7Ig3fI=",
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "rev": "9c875e0c56cf2eb272b9102a4f3e24e4e31629fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "type": "github"
+      }
+    },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+<<<<<<< HEAD
+        "lastModified": 1745978191,
+        "narHash": "sha256-DC9GhExyUbJKbBMgs+YA4fuUzOqUPuA6pR0mDI3MELk=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "72da67da783674ef82032f4d5bcf686a7ccd8776",
+=======
+        "lastModified": 1750039657,
+        "narHash": "sha256-Vrh5PDskpJ2kEumHbncffZxWQGr2pK88oTOFtBUWG74=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "54ce2a0e930383535c632aad39b22205fa430be0",
+>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1750083401,
+        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+<<<<<<< HEAD
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+=======
+        "lastModified": 1749794982,
+        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+<<<<<<< HEAD
+        "lastModified": 1745921652,
+        "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
+=======
+        "lastModified": 1750005367,
+        "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
+>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "home-manager": "home-manager",
+        "nix-index-database": "nix-index-database",
+        "nix-system-graphics": "nix-system-graphics",
+        "nix-vscode-extensions": "nix-vscode-extensions",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "system-manager": "system-manager"
+      }
+    },
+    "system-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748252092,
+        "narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=",
+        "owner": "numtide",
+        "repo": "system-manager",
+        "rev": "c6850451ef769fd03d0ad5474f928b916aa23775",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "system-manager",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake_BASE_10015.lock
+++ b/flake_BASE_10015.lock
@@ -0,0 +1,215 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745812220,
+        "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745557122,
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-system-graphics": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737457219,
+        "narHash": "sha256-nX9dxoATDCSQgWw/iv6BngXDJEyHVYYEvHEVQ7Ig3fI=",
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "rev": "9c875e0c56cf2eb272b9102a4f3e24e4e31629fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "type": "github"
+      }
+    },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1745891836,
+        "narHash": "sha256-UJpwh09VKotfAoZRz6NNYZ1mepbhlkvYuoUSnMdUXCs=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "7387c46187fb2bbeb8bd1c94368a666e7bbd60c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1745955289,
+        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1745794561,
+        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1745868005,
+        "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "330d0a4167924b43f31cc9406df363f71b768a02",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "home-manager": "home-manager",
+        "nix-system-graphics": "nix-system-graphics",
+        "nix-vscode-extensions": "nix-vscode-extensions",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "system-manager": "system-manager"
+      }
+    },
+    "system-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744139528,
+        "narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=",
+        "owner": "numtide",
+        "repo": "system-manager",
+        "rev": "803322102ed51f29c250d4bff2973625adc4a521",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "system-manager",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake_LOCAL_10015.lock
+++ b/flake_LOCAL_10015.lock
@@ -0,0 +1,215 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745812220,
+        "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745557122,
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-system-graphics": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737457219,
+        "narHash": "sha256-nX9dxoATDCSQgWw/iv6BngXDJEyHVYYEvHEVQ7Ig3fI=",
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "rev": "9c875e0c56cf2eb272b9102a4f3e24e4e31629fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "type": "github"
+      }
+    },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1745978191,
+        "narHash": "sha256-DC9GhExyUbJKbBMgs+YA4fuUzOqUPuA6pR0mDI3MELk=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "72da67da783674ef82032f4d5bcf686a7ccd8776",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1745955289,
+        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1745921652,
+        "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "home-manager": "home-manager",
+        "nix-system-graphics": "nix-system-graphics",
+        "nix-vscode-extensions": "nix-vscode-extensions",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "system-manager": "system-manager"
+      }
+    },
+    "system-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744139528,
+        "narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=",
+        "owner": "numtide",
+        "repo": "system-manager",
+        "rev": "803322102ed51f29c250d4bff2973625adc4a521",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "system-manager",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake_REMOTE_10015.lock
+++ b/flake_REMOTE_10015.lock
@@ -0,0 +1,236 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750040002,
+        "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749960154,
+        "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "424a40050cdc5f494ec45e46462d288f08c64475",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
+    "nix-system-graphics": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737457219,
+        "narHash": "sha256-nX9dxoATDCSQgWw/iv6BngXDJEyHVYYEvHEVQ7Ig3fI=",
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "rev": "9c875e0c56cf2eb272b9102a4f3e24e4e31629fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "type": "github"
+      }
+    },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1750039657,
+        "narHash": "sha256-Vrh5PDskpJ2kEumHbncffZxWQGr2pK88oTOFtBUWG74=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "54ce2a0e930383535c632aad39b22205fa430be0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1750083401,
+        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1749794982,
+        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1750005367,
+        "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "home-manager": "home-manager",
+        "nix-index-database": "nix-index-database",
+        "nix-system-graphics": "nix-system-graphics",
+        "nix-vscode-extensions": "nix-vscode-extensions",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "system-manager": "system-manager"
+      }
+    },
+    "system-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748252092,
+        "narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=",
+        "owner": "numtide",
+        "repo": "system-manager",
+        "rev": "c6850451ef769fd03d0ad5474f928b916aa23775",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "system-manager",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/home-manager/base.nix
+++ b/home-manager/base.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, inputs, ... }:

 {
  imports = [
@@ -13,7 +13,7 @@
    keepassxc
    qbittorrent
    libreoffice-qt
-    joplin-desktop
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop

    # comms   
    teamspeak_client
@@ -56,8 +56,6 @@
        }
      );
      config = {
-        video-sync = "display-resample";
-        interpolation = "yes";
        screenshot-directory = "~/Pictures/";
        screenshot-template = "%F/%F_snapshot_%P";
      };
--- a/home-manager/base/fonts.nix
+++ b/home-manager/base/fonts.nix
@@ -2,10 +2,10 @@

 {
  home.packages = with pkgs;[
-    liberation_ttf
    ubuntu-sans
    ubuntu-sans-mono
-    (nerdfonts.override { fonts = [ "SpaceMono" ]; })
+    nerd-fonts.space-mono
+    corefonts
  ];

  fonts.fontconfig = {
--- a/home-manager/base/terminal.nix
+++ b/home-manager/base/terminal.nix
@@ -23,16 +23,25 @@ with lib;

  config = {
    home.packages = with pkgs;[
-      blesh
-      (nerdfonts.override { fonts = [ "SpaceMono" ]; })
+      nerd-fonts.space-mono
    ];

    programs = {
      bash = {
        enable = true;
-        bashrcExtra = ''
-          source $(blesh-share)/ble.sh
-          bleopt canvas_winch_action=redraw-prev
+        initExtra = ''
+          if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+          then
+            shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+            exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+          fi
+        '';
+      };
+
+      fish = {
+        enable = true;
+        interactiveShellInit = ''
+          set fish_greeting # Disable greeting
        '';
      };

@@ -93,8 +102,10 @@ with lib;
      zellij = {
        enable = true;
        enableBashIntegration = true;
+        enableFishIntegration = true;
        settings = {
          theme = "dracula";
+          show_startup_tips = false;
        };
      };

@@ -119,6 +130,7 @@ with lib;
      eza = {
        enable = true;
        enableBashIntegration = true;
+        enableFishIntegration = true;
        git = true;
        extraOptions = [
          "--color=auto"
@@ -131,7 +143,7 @@ with lib;
      yazi = {
        enable = true;
        settings = {
-          manager = {
+          mgr = {
            sort_by = "natural";
            show_hidden = true;
          };
--- a/home-manager/development/games.nix
+++ b/home-manager/development/games.nix
@@ -1,17 +1,8 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:

 {
  home.packages = with pkgs;[
    jetbrains.rider
-    # Remove when https://github.com/NixOS/nixpkgs/issues/393332 resolved (likely when 25.05 is out)
-    # godot-mono
-    (symlinkJoin {
-      name = "godot-mono";
-      paths = [ inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono ];
-      buildInputs = [ makeWrapper ];
-      postBuild = ''
-        wrapProgram $out/bin/godot4-mono --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1
-      '';
-    })
+    godot-mono
  ];
 }
--- a/home-manager/development/helix.nix
+++ b/home-manager/development/helix.nix
@@ -28,6 +28,9 @@ with lib;
            nixd
            nixpkgs-fmt
            biome
+            omnisharp-roslyn
+            netcoredbg
+            ruff
          ] ++ (with nodePackages;[
            vscode-langservers-extracted
            typescript-language-server
--- a/home-manager/development/vscode.nix
+++ b/home-manager/development/vscode.nix
@@ -6,86 +6,90 @@ let
 in
 {
  home.packages = with pkgs;[
-    (nerdfonts.override { fonts = [ "SpaceMono" ]; })
+    nerd-fonts.space-mono
  ];

  programs = {
    vscode = {
      enable = true;
-      package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".vscodium;
+      package = pkgs.vscodium;
      mutableExtensionsDir = false;
-      enableUpdateCheck = false;
-      enableExtensionUpdateCheck = false;
-      extensions = with openvsx;[
-        biomejs.biome
-        mkhl.direnv
-        dracula-theme.theme-dracula
-        dbaeumer.vscode-eslint
-        eamodio.gitlens
-        pkief.material-icon-theme
-        jnoortheen.nix-ide
-        esbenp.prettier-vscode
-        humao.rest-client
-        loriscro.super
-        mads-hartmann.bash-ide-vscode
-        foxundermoon.shell-format
-        dart-code.flutter
-        ms-vscode.wasm-wasi-core
-        rust-lang.rust-analyzer
-        tamasfe.even-better-toml
-        mikestead.dotenv
-      ] ++ [ vscode-marketplace.bradlc.vscode-tailwindcss ];
-      userSettings = with pkgs;{
-        "workbench.iconTheme" = "material-icon-theme";
-        "window.titleBarStyle" = "custom";
-        "workbench.colorTheme" = "Dracula Theme";
-        "explorer.compactFolders" = false;
-        "chat.commandCenter.enabled" = false;
-
-        "editor.fontFamily" = "'SpaceMono Nerd Font', 'monospace', monospace";
-        "editor.fontSize" = 16;
-        "editor.formatOnSave" = true;
-        "editor.codeActionsOnSave" = {
-          "source.organizeImports" = "always";
-        };
-
-        "files.autoSave" = "onWindowChange";
-
-        "[typescript]" = {
-          "editor.defaultFormatter" = "biomejs.biome";
-        };
-        "[javascript]" = {
-          "editor.defaultFormatter" = "biomejs.biome";
-        };
-        "[javascriptreact]" = {
-          "editor.defaultFormatter" = "biomejs.biome";
-        };
-        "[typescriptreact]" = {
-          "editor.defaultFormatter" = "biomejs.biome";
-        };
-        "[json]" = {
-          "editor.defaultFormatter" = "biomejs.biome";
-        };
-        "[jsonc]" = {
-          "editor.defaultFormatter" = "biomejs.biome";
-        };
-        "biome.lsp.bin" = "${biome}/bin/biome";
-        "biome.requireConfigFile" = true;
-
-        "typescript.preferences.preferTypeOnlyAutoImports" = true;
-
-        "nix.enableLanguageServer" = true; # Enable LSP.
-        "nix.serverPath" = "${nixd}/bin/nixd"; # The path to the LSP server executable.
-        "nix.serverSettings" = {
-          nixd = {
-            formatting.command = [ "${nixpkgs-fmt}/bin/nixpkgs-fmt" ];
+      profiles.default = {
+        enableUpdateCheck = false;
+        enableExtensionUpdateCheck = false;
+        extensions = (with openvsx;[
+          biomejs.biome
+          mkhl.direnv
+          dracula-theme.theme-dracula
+          dbaeumer.vscode-eslint
+          pkief.material-icon-theme
+          jnoortheen.nix-ide
+          esbenp.prettier-vscode
+          loriscro.super
+          mads-hartmann.bash-ide-vscode
+          ms-vscode.wasm-wasi-core
+          rust-lang.rust-analyzer
+          tamasfe.even-better-toml
+          mikestead.dotenv
+          ms-python.python
+          ms-python.debugpy
+          charliermarsh.ruff
+        ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]);
+        userSettings = with pkgs;{
+          "workbench.iconTheme" = "material-icon-theme";
+          "window.titleBarStyle" = "custom";
+          "workbench.colorTheme" = "Dracula Theme";
+          "explorer.compactFolders" = false;
+          "chat.commandCenter.enabled" = false;
+          "terminal.integrated.automationProfile.linux" = {
+            "path" = "/bin/sh";
          };
+
+          "editor.fontFamily" = "'SpaceMono Nerd Font', 'monospace', monospace";
+          "editor.fontSize" = 16;
+          "editor.formatOnSave" = true;
+          "editor.codeActionsOnSave" = {
+            "source.organizeImports" = "always";
+          };
+
+          "files.autoSave" = "onWindowChange";
+
+          "[typescript]" = {
+            "editor.defaultFormatter" = "biomejs.biome";
+          };
+          "[javascript]" = {
+            "editor.defaultFormatter" = "biomejs.biome";
+          };
+          "[javascriptreact]" = {
+            "editor.defaultFormatter" = "biomejs.biome";
+          };
+          "[typescriptreact]" = {
+            "editor.defaultFormatter" = "biomejs.biome";
+          };
+          "[json]" = {
+            "editor.defaultFormatter" = "biomejs.biome";
+          };
+          "[jsonc]" = {
+            "editor.defaultFormatter" = "biomejs.biome";
+          };
+          "biome.lsp.bin" = "${biome}/bin/biome";
+          #"biome.requireConfigFile" = true;
+
+          "typescript.preferences.preferTypeOnlyAutoImports" = true;
+
+          "nix.enableLanguageServer" = true; # Enable LSP.
+          "nix.serverPath" = "${nixd}/bin/nixd"; # The path to the LSP server executable.
+          "nix.serverSettings" = {
+            nixd = {
+              formatting.command = [ "${nixpkgs-fmt}/bin/nixpkgs-fmt" ];
+            };
+          };
+
+          "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck";
+          "bashIde.shfmt.path" = "${shfmt}/bin/shfmt";
+
+          "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ];
        };
-
-        "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck";
-        "shellformat.path" = "${shfmt}/bin/shfmt";
-
-        "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ];
      };
    };
  };
--- a/home-manager/gaming.nix
+++ b/home-manager/gaming.nix
@@ -1,12 +1,16 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:

 {
  home.packages = with pkgs;[
    steamguard-cli
    bottles
-    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryubing
+    ryubing
    mgba
    scanmem
-    heroic
+    (heroic.override {
+      extraPkgs = pkgs: [
+        pkgs.gamescope
+      ];
+    })
  ];
 }