clean up

flake.lock

@@ -5,11 +5,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
         "type": "github"
       },
       "original": {
@@ -21,27 +21,28 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "lastModified": 1765809053,
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
         "type": "github"
       }
     },
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1736852337,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -70,11 +71,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1744642301,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
+        "lastModified": 1764873433,
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
         "type": "github"
       },
       "original": {
@@ -83,21 +84,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -106,11 +92,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -135,69 +121,23 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "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"
-      }
-    },
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "host": "gitlab.gnome.org",
+        "lastModified": 1767737596,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
-        "type": "github"
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "gitlab"
       },
       "original": {
+        "host": "gitlab.gnome.org",
         "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "gnome-49",
         "repo": "gnome-shell",
-        "type": "github"
+        "type": "gitlab"
       }
     },
     "home-manager": {
@@ -205,51 +145,31 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1747565775,
-        "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
+        "lastModified": 1768949235,
+        "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747279714,
-        "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
+        "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747129300,
-        "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
-        "owner": "NixOS",
+        "lastModified": 1769302137,
+        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "e81fd167b33121269149c57806599045fd33eeed",
+        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
@@ -257,48 +177,48 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1769318308,
+        "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -312,15 +232,14 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
+        ]
       },
       "locked": {
-        "lastModified": 1746056780,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
+        "lastModified": 1767886815,
+        "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
+        "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef",
         "type": "github"
       },
       "original": {
@@ -344,11 +263,8 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_3",
         "nur": "nur",
         "systems": "systems",
@@ -359,15 +275,16 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1747578370,
-        "narHash": "sha256-7pk8quDMQcGIVmm7KXMQLI5CbfamwPv/vO20cTcT/wI=",
+        "lastModified": 1769472288,
+        "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "2eaa338eb879b8432f7e252d6ab8725ada98f52d",
+        "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c",
         "type": "github"
       },
       "original": {
         "owner": "danth",
+        "ref": "release-25.11",
         "repo": "stylix",
         "type": "github"
       }
@@ -407,28 +324,27 @@
     "tinted-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1716423189,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
         "type": "github"
       }
     },
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1744974599,
-        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
+        "lastModified": 1767817087,
+        "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
+        "rev": "bd99656235aab343e3d597bf196df9bc67429507",
         "type": "github"
       },
       "original": {
@@ -440,11 +356,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1745111349,
-        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
+        "lastModified": 1767489635,
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
         "type": "github"
       },
       "original": {
@@ -456,11 +372,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1725758778,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
+        "lastModified": 1767488740,
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
         "type": "github"
       },
       "original": {
@@ -468,28 +384,6 @@
         "repo": "base16-zed",
         "type": "github"
       }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,10 +2,10 @@
   description = "Nixos config flake";
 
   inputs = {
-    stylix.url = "github:danth/stylix";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    stylix.url = "github:danth/stylix/release-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
+    nixos-hardware.url = "github:nixos/nixos-hardware/master";
   };
 
   outputs = {
@@ -26,7 +26,6 @@
           inputs.home-manager.nixosModules.default
           inputs.stylix.nixosModules.stylix
           nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
-          (import ./overlays/ollama.nix)
         ];
       };
 
@@ -45,7 +44,6 @@
           ./hosts/server/configuration.nix
           inputs.home-manager.nixosModules.default
           nixos-hardware.nixosModules.system76
-          (import ./overlays/ollama.nix)
         ];
       };
 

hosts/desktop/configuration.nix

@@ -13,16 +13,13 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPatches = [
-    {
-      name = "amdgpu-ignore-ctx-privileges";
-      patch = pkgs.fetchpatch {
-        name = "cap_sys_nice_begone.patch";
-        url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch";
-        hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo=";
-      };
-    }
-  ];
+
+  hardware.amdgpu.opencl.enable = true;
+  boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1" ];
+  services.openssh = {enable = true;};
+
+  virtualisation.docker.enable = true;
+  virtualisation.docker.storageDriver = "btrfs";
 
 
   networking = {
@@ -40,26 +37,26 @@
 
   services = {
     pipewire = {
-      enable = true;
+      enable = false;
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
       jack.enable = true;
     };
     wivrn = {
-      enable = true;
+      enable = false;
       defaultRuntime = true;
       autoStart = true;
     };
     xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-    }
+      enable = false;
+      displayManager.gdm.enable = false;
+      desktopManager.gnome.enable = false;
+    };
   };
 
   stylix = {
-    enable = true;
+    enable = false;
     autoEnable = true;
     polarity = "light";
     image = ../laptop/wallpaper.png;
@@ -107,22 +104,22 @@
     };
   };
 
-  hardware = {
-    graphics.enable32Bit = true;
-  };
+  #hardware = {
+  #  graphics.enable32Bit = true;
+  #};
 
   programs = {
     zsh.enable = true;
-    steam.enable = true;
-    gamescope.enable = true;
-    envision.enable = true;
-    corectrl.enable = true;
+    steam.enable = false;
+    gamescope.enable = false;
+    envision.enable = false;
+    corectrl.enable = false;
   };
 
   users.users.k = {
     isNormalUser = true;
     description = "k";
-    extraGroups = ["networkmanager" "wheel"];
+    extraGroups = ["networkmanager" "wheel" "docker"];
     packages = with pkgs; [zsh];
     shell = pkgs.zsh;
   };

hosts/desktop/hardware-configuration.nix

@@ -1,34 +1,29 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/aace1ae9-2a8f-4a90-9e0b-cb21779636d2";
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/nixos";
       fsType = "btrfs";
     };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/8D75-F095";
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/BB87-CC45";
       fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
     };
 
-  swapDevices = [];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/desktop/home.nix

@@ -4,44 +4,44 @@
   inputs,
   ...
 }: {
-  imports = [../home/home_common.nix ../home/gnone.nix];
+  imports = [../home/home_common.nix];
   nixpkgs.config.allowUnfree = true;
-  home = {
-    packages = with pkgs; [
-      steam
-      neovim
-      firefox
-      wivrn
-      opencomposite
-      wlx-overlay-s
-      glslang
-      gst_all_1.gstreamer
-      libdrm
-      openxr-loader
-      khronos-ocl-icd-loader
-    ];
-  };
+  #home = {
+  #  packages = with pkgs; [
+  #    steam
+  #    neovim
+  #    firefox
+  #    wivrn
+  #    opencomposite
+  #    wlx-overlay-s
+  #    glslang
+  #    gst_all_1.gstreamer
+  #    libdrm
+  #    openxr-loader
+  #    khronos-ocl-icd-loader
+  #  ];
+  #};
 
   # For WiVRn:
-  xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
+  #xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
 
-  xdg.configFile."openvr/openvrpaths.vrpath".text = ''
-    {
-      "config" :
-      [
-        "${config.xdg.dataHome}/Steam/config"
-      ],
-      "external_drivers" : null,
-      "jsonid" : "vrpathreg",
-      "log" :
-      [
-        "${config.xdg.dataHome}/Steam/logs"
-      ],
-      "runtime" :
-      [
-        "${pkgs.opencomposite}/lib/opencomposite"
-      ],
-      "version" : 1
-    }
-  '';
+  #xdg.configFile."openvr/openvrpaths.vrpath".text = ''
+  #  {
+  #    "config" :
+  #    [
+  #      "${config.xdg.dataHome}/Steam/config"
+  #    ],
+  #    "external_drivers" : null,
+  #    "jsonid" : "vrpathreg",
+  #    "log" :
+  #    [
+  #      "${config.xdg.dataHome}/Steam/logs"
+  #    ],
+  #    "runtime" :
+  #    [
+  #      "${pkgs.opencomposite}/lib/opencomposite"
+  #    ],
+  #    "version" : 1
+  #  }
+  #'';
 }

hosts/home/home_common.nix

@@ -17,40 +17,24 @@
     };
     tmux.enable = true;
     starship.enable = true;
-    nushell = {
+    zsh = {
       enable = true;
-      shellAliases = {
-        cat = "bat";
+      autosuggestion.enable = true;
+      enableCompletion = true;
+      syntaxHighlighting.enable = true;
+      autocd = true;
+      plugins = [
+        {
+          name = "zsh-nix-shell";
+          file = "nix-shell.plugin.zsh";
+          src = pkgs.fetchFromGitHub {
+            owner = "chisui";
+            repo = "zsh-nix-shell";
+            rev = "v0.8.0";
+            sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
           };
-      extraConfig = ''
-        $env.config = {
-         show_banner: false,
         }
-      '';
+      ];
     };
-    carapace = {
-      enable = true;
-      enableNushellIntegration = true;
-    };
-    bat.enable = true;
-    # zsh = {
-    #   enable = true;
-    #   autosuggestion.enable = true;
-    #   enableCompletion = true;
-    #   syntaxHighlighting.enable = true;
-    #   autocd = true;
-    #   plugins = [
-    #     {
-    #       name = "zsh-nix-shell";
-    #       file = "nix-shell.plugin.zsh";
-    #       src = pkgs.fetchFromGitHub {
-    #         owner = "chisui";
-    #         repo = "zsh-nix-shell";
-    #         rev = "v0.8.0";
-    #         sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-    #       };
-    #     }
-    #   ];
-    # };
   };
 }

hosts/home/hyprland.nix

@@ -51,7 +51,9 @@
     settings = {
       exec-once = [
         #"${pkgs.iio-hyprland}/bin/iio-hyprland"
-        #"${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
+        "${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
+        "${pkgs.waybar}/bin/waybar"
+        "${pkgs.hyprpaper}/bin/hyprpaper"
       ];
       monitor = "eDP-1,preferred,auto,1";
       general = {
@@ -97,9 +99,16 @@
         "$mainMod, Return, exec, $terminal"
         "$mainMod, D, exec, $menu"
         "$mainMod Shift, C, killactive,"
-        "$mainMod, Space, exec, toggle_float"
+        "$mainMod, Space, togglefloating"
         "$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock"
 
+        #emacs
+        "$mainMod, E, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c"
+        "$mainMod, C, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(org-roam-capture)\""
+        "$mainMod, B, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(call-interactively #'bookmark-jump)\""
+        "$mainMod, P, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(project-dired)\""
+        "$mainMod, M, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e \"(mingus)\""
+
         # switch focus
         "$mainMod, left, movefocus, l"
         "$mainMod, right, movefocus, r"

hosts/home/niri.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./waybar.nix ./tile.nix];
+  home.packages = with pkgs; [
+    pkgs.swaybg
+    pkgs.swayidle
+    pkgs.swaylock
+    pkgs.niri
+    pkgs.fuzzel
+    pkgs.iio-niri
+    pkgs.squeekboard
+  ];
+}

hosts/home/tile.nix

@@ -14,7 +14,7 @@
     alacritty = {enable = true;};
     wofi = {enable = true;};
     zathura = {enable = true;};
-   #mpv = {enable = true;};
+    mpv = {enable = true;};
     lf = {enable = true;};
   };
   home.packages = with pkgs; [

hosts/home/waybar.nix

@@ -15,7 +15,7 @@
         margin-right = 45;
         spacing = 15;
 
-        modules-left = ["sway/workspaces" "sway/mode"];
+        modules-left = ["sway/workspaces" "sway/mode" "hyprland/window"];
         modules-center = ["clock"];
         modules-right = ["pulseaudio" "network" "battery"];
 

hosts/laptop/configuration.nix

@@ -27,8 +27,8 @@
     gc.automatic = false;
     settings = {
       experimental-features = ["nix-command" "flakes"];
-      substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
-      trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
+      #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
+      #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
     };
   };
 
@@ -38,23 +38,21 @@
     firewall.enable = true;
   };
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LC_ADDRESS = "en_US.UTF-8";
-      LC_IDENTIFICATION = "en_US.UTF-8";
-      LC_MEASUREMENT = "en_US.UTF-8";
-      LC_MONETARY = "en_US.UTF-8";
-      LC_NAME = "en_US.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "en_US.UTF-8";
-      LC_TELEPHONE = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
-    };
-  };
+  i18n.defaultLocale = "en_US.UTF-8";
 
   services = {
-    hardware.bolt = {enable = false;};
+    displayManager.ly = {
+      enable = true;
+      x11Support = false;
+      settings = {
+        animation = "colormix";
+        battery_id = "BAT0";
+        clear_password = true;
+        colormix_col1 = "0xffffea";
+        colormix_col2 = "0x006600";
+        colormix_col3 = "0x8888cc";
+      };
+    };
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -62,10 +60,6 @@
       pulse.enable = true;
       jack.enable = true;
     };
-    ollama = {
-      enable = false;
-      package = pkgs.ollama-intel;
-    };
     auto-cpufreq = {
       enable = true;
       settings = {
@@ -83,14 +77,10 @@
       lidSwitch = "suspend-then-hibernate";
       lidSwitchExternalPower = "suspend";
     };
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true; # If you have a firewall enabled
-    };
 
+    hardware.bolt.enable = true;
     blueman.enable = true;
-    fwupd.enable = false;
+    fwupd.enable = true;
     printing.enable = true;
     fprintd.enable = true;
     thermald.enable = true;
@@ -101,11 +91,31 @@
     autoEnable = true;
     polarity = "light";
     image = ./wallpaper.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/precious-light-warm.yaml";
+    base16Scheme = {
+      base00 = "#ffffea";
+      base01 = "#eaffff";
+      base02 = "#eeee9e";
+      base03 = "#99994c";
+      base04 = "#555555";
+      base05 = "#000000";
+      base06 = "#000000";
+      base07 = "#000000";
+      base08 = "#aa0000";
+      base09 = "#884400";
+      base0A = "#99994c";
+      base0B = "#006600";
+      base0C = "#8888cc";
+      base0D = "#000099";
+      base0E = "#8888cc";
+      base0F = "#5d3a1a";
+    };
+    targets.chromium.enable = false;
+    targets.gnome.enable = false;
     opacity = {
       terminal = 0.85;
       popups = 0.75;
       desktop = 0.75;
+      applications = 0.85;
     };
     cursor = {
       package = pkgs.adwaita-icon-theme;
@@ -132,35 +142,23 @@
 
   hardware = {
     sensor.iio.enable = true;
-    graphics.enable32Bit = true;
-    graphics.extraPackages = with pkgs; [
-      intel-vaapi-driver
-      intel-media-driver
-      intel-compute-runtime
-    ];
-  };
-
-  virtualisation.podman = {
-    enable = true;
-    dockerCompat = true;
   };
 
   programs = {
     zsh.enable = true;
-    regreet.enable = true;
-    hyprlock.enable = true;
-    hyprland = {
-      enable = true;
-      withUWSM = true;
+    niri.enable = true;
   };
+
+  virtualisation = {
+    docker = {enable = true;};
   };
 
   users.users.k = {
     isNormalUser = true;
     description = "k";
-    extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [nushell];
-    shell = pkgs.nushell;
+    extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"];
+    packages = with pkgs; [zsh];
+    shell = pkgs.zsh;
   };
 
   home-manager = {
@@ -171,11 +169,12 @@
   environment = {
     sessionVariables = {MOZ_USE_XINPUT2 = "1";};
     systemPackages = with pkgs; [
+      config.boot.kernelPackages.perf
     ];
   };
 
   systemd.sleep.extraConfig = ''
-    HibernateDelaySec=30m
+    HibernateDelaySec=20m
     SuspendState=mem
   '';
 
@@ -191,7 +190,6 @@
       "loglevel=3"
       "rd.systemd.show_status=false"
       "rd.udev.log_level=3"
-      "udev.log_priority=3"
     ];
     loader.timeout = 0;
   };

hosts/laptop/home.nix

@@ -6,7 +6,7 @@
 }: {
   imports = [
     ../home/home_common.nix
-    ../home/hyprland.nix
+    ../home/niri.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -14,19 +14,27 @@
   home = {
     packages = with pkgs; [
       firefox
+      lagrange
+      chromium #this might replace firefox
       keepassxc
       thunderbird
       blender
       vesktop
       spotify
+      alacritty
 
       btop
       zip
-      emacs-gtk
+
+      prismlauncher
+      steam
+      gamescope
 
       direnv
       texliveFull
       ispell
+
+      calc
     ];
   };
 
@@ -36,6 +44,17 @@
       enableZshIntegration = true;
       nix-direnv.enable = true;
     };
+
+    emacs = {
+      enable = true;
+      package = pkgs.emacs-pgtk.override {
+        withTreeSitter = true;
+        withNativeCompilation = true;
+      };
+      extraPackages = epkgs: [
+        epkgs.vterm
+      ];
+    };
   };
 
   services = {
@@ -45,14 +64,15 @@
       enable = true;
       musicDirectory = "/home/k/Music";
     };
+
     emacs = {
       enable = true;
       defaultEditor = true;
-      package = pkgs.emacs-gtk;
     };
   };
   stylix = {
     enable = true;
     autoEnable = true;
+    targets.gnome.enable = false;
   };
 }

hosts/server/configuration.nix

@@ -13,8 +13,8 @@
     gc.automatic = true;
     settings = {
       experimental-features = ["nix-command" "flakes"];
-      substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
-      trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
+      #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
+      #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
     };
   };
 
@@ -30,7 +30,7 @@
 
   users = {
     motd = "Welcome to the Server";
-    defaultUserShell = pkgs.nushell;
+    defaultUserShell = pkgs.zsh;
     users = {
       k = {
         isNormalUser = true;
@@ -48,9 +48,15 @@
     };
   };
 
-  home-manager = {users = {"k" = import ./home.nix;};};
+  home-manager = {
+    backupFileExtension = "bk";
+    users = {"k" = import ./home.nix;};
+  };
 
-  environment.systemPackages = with pkgs; [microcodeIntel];
+  environment.systemPackages = with pkgs; [
+    microcodeIntel
+    firefox
+  ];
 
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;

hosts/server/home.nix

@@ -5,5 +5,8 @@
   ...
 }: {
   imports = [../home/home_common.nix];
-  home = {packages = with pkgs; [docker docker-compose neovim];};
+  home = {packages = with pkgs; [docker docker-compose neovim waypipe];};
+  services = {
+    syncthing.enable = true;
+  };
 }

hosts/server/service.nix

@@ -3,11 +3,37 @@
   lib,
   ...
 }: {
-  networking.firewall = {
+  networking = {
+    firewall = {
       enable = true;
-    allowedTCPPorts = [80 443 22];
-    allowedUDPPorts = [];
+      allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132];
+      allowedUDPPorts = [26615 8080 1900 51820 53 19132];
     };
+    nat.externalInterface = "wlp0s20f3";
+    nat.internalInterfaces = ["wg0"];
+    wireguard.interfaces = {
+      wg0 = {
+        ips = ["10.0.0.1/24"];
+        listenPort = 51820;
+        privateKeyFile = "/keys/wg-private";
+        peers = [
+          {
+            # laptop
+            publicKey = "Ze2y3K+blI3aBc1AKTlvv90j+McBaitB+qSLazsuSFM=";
+            allowedIPs = ["10.0.0.2/32"];
+          }
+
+          {
+            # phone
+            publicKey = "vcheBoHRxCrwzbMw0UI9ZsQfVDJizBWkeM+pF5/8+HE=";
+            allowedIPs = ["10.0.0.3/32"];
+          }
+        ];
+      };
+    };
+  };
+
+  networking.nat.enable = true;
 
   security.acme = {
     acceptTerms = true;
@@ -37,7 +63,7 @@
     };
 
     ollama = {
-      enable = true;
+      enable = false;
       package = pkgs.ollama-intel;
     };
 
@@ -70,8 +96,8 @@
     };
 
     home-assistant = {
-      enable = true;
-      extraComponents = ["wiz" "fail2ban" "ollama" "wyoming"];
+      enable = false;
+      extraComponents = ["wiz" "fail2ban" "ollama" "wyoming" "androidtv" "androidtv_remote"];
       config = {
         default_config = {};
         "automation ui" = "!include automations.yaml";
@@ -85,12 +111,12 @@
 
     wyoming = {
       piper.servers."piperNix" = {
-        enable = true;
+        enable = false;
         uri = "tcp://0.0.0.0:10200";
         voice = "en-us-ryan-low";
       };
       faster-whisper.servers."whisperNix" = {
-        enable = true;
+        enable = false;
         uri = "tcp://0.0.0.0:10300";
         language = "en";
       };
@@ -173,6 +199,15 @@
           };
         };
 
+        "map.dhilton.xyz" = {
+          forceSSL = true;
+          enableACME = true;
+          locations."/" = {
+            proxyPass = "http://127.0.0.1:8100";
+            proxyWebsockets = true;
+          };
+        };
+
         "nix.dhilton.xyz" = {
           locations."/".proxyPass = "http://127.0.0.1:5000";
         };

overlays/ollama.nix

@@ -34,6 +34,9 @@
                    #!/bin/sh
                    export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
                    export OLLAMA_INTEL_GPU=1
+            export OLLAMA_NUM_GPU=999
+            export ZES_ENABLE_SYSMAN=1
+            export SYCL_CACHE_PERSISTENT=1
                    exec "$out/bin/ollama-base" "\$@"
                    EOF
                    chmod +x "$out/bin/ollama-wrapped"