Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs

.gitea/workflows/nix-check.yaml

@@ -0,0 +1,11 @@
+name: Verify Nix Flake
+run-name: ${{ gitea.actor }} is nix-check
+on: [push]
+
+jobs:
+  verify_build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v30
+      - run: nix flake check

flake.lock

@@ -5,11 +5,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1708890466,
+        "lastModified": 1755819240,
-        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "665b3c6748534eb766c777298721cece9453fdae",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
         "type": "github"
       },
       "original": {
@@ -21,27 +21,28 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1622559957,
+        "lastModified": 1754405784,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       }
     },
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1725860795,
+        "lastModified": 1760703920,
-        "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -53,64 +54,65 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1716150083,
+        "lastModified": 1732806396,
-        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
         "owner": "tinted-theming",
         "repo": "base16-vim",
-        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
         "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
         "type": "github"
       }
     },
-    "flake-compat": {
+    "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1764724327,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
-        "owner": "edolstra",
+        "owner": "rafaelmardojai",
-        "repo": "flake-compat",
+        "repo": "firefox-gnome-theme",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "rafaelmardojai",
-        "repo": "flake-compat",
+        "repo": "firefox-gnome-theme",
         "type": "github"
       }
     },
-    "flake-utils": {
+    "flake-parts": {
       "inputs": {
-        "systems": [
+        "nixpkgs-lib": [
           "stylix",
-          "systems"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1763759067,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
     "fromYaml": {
       "flake": false,
       "locked": {
-        "lastModified": 1689549921,
+        "lastModified": 1731966426,
-        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
         "owner": "SenchoPens",
         "repo": "fromYaml",
-        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
         "type": "github"
       },
       "original": {
@@ -122,72 +124,52 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1713702291,
+        "host": "gitlab.gnome.org",
-        "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
+        "lastModified": 1764524476,
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
-        "type": "github"
+        "type": "gitlab"
       },
       "original": {
+        "host": "gitlab.gnome.org",
         "owner": "GNOME",
-        "ref": "46.1",
+        "ref": "gnome-49",
         "repo": "gnome-shell",
-        "type": "github"
+        "type": "gitlab"
       }
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1729027341,
+        "lastModified": 1765170903,
-        "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
+        "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
+        "rev": "20561be440a11ec57a89715480717baf19fe6343",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724435763,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1728729581,
+        "lastModified": 1764440730,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
@@ -195,37 +177,82 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 0,
+        "lastModified": 1764831616,
-        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
+        "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
-        "path": "/nix/store/cjz8w4dgc3rd2n3dqv5c208vygndjyba-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1725194671,
-        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
+        "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1764983851,
+        "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1764522689,
+        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "inputs": {
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764773531,
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "stylix": "stylix"
       }
     },
@@ -235,26 +262,29 @@
         "base16-fish": "base16-fish",
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat",
+        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
         "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_3",
-        "nixpkgs": "nixpkgs_2",
+        "nur": "nur",
         "systems": "systems",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
-        "tinted-tmux": "tinted-tmux"
+        "tinted-schemes": "tinted-schemes",
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1728900372,
+        "lastModified": 1765065096,
-        "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=",
+        "narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d",
+        "rev": "84d9d55885d463d461234f3aac07b2389a2577d8",
         "type": "github"
       },
       "original": {
         "owner": "danth",
+        "ref": "release-25.11",
         "repo": "stylix",
         "type": "github"
       }
@@ -277,44 +307,60 @@
     "tinted-foot": {
       "flake": false,
       "locked": {
-        "lastModified": 1696725948,
+        "lastModified": 1726913040,
-        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
         "owner": "tinted-theming",
         "repo": "tinted-foot",
-        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
         "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
         "type": "github"
       }
     },
     "tinted-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1716423189,
+        "lastModified": 1735730497,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "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": 1763914658,
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
         "type": "github"
       }
     },
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1696725902,
+        "lastModified": 1764465359,
-        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
         "type": "github"
       },
       "original": {
@@ -322,6 +368,22 @@
         "repo": "tinted-tmux",
         "type": "github"
       }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1764464512,
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,49 +2,61 @@
   description = "Nixos config flake";
 
   inputs = {
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    stylix.url = "github:danth/stylix/release-25.11";
-    stylix.url = "github:danth/stylix";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
-    home-manager = {
+    nixos-hardware.url = "github:nixos/nixos-hardware/master";
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, nixos-hardware, ... }@inputs:
+  outputs = {
-    let
+    self,
-      system = "x86_64-linux";
+    nixpkgs,
-      pkg = nixpkgs.legacyPackages.${system};
+    nixos-hardware,
-    in {
+    ...
-      nixosConfigurations = {
+  } @ inputs: let
-        laptop = nixpkgs.lib.nixosSystem {
+    system = "x86_64-linux";
-          specialArgs = { inherit inputs; };
+    pkg = nixpkgs.legacyPackages.${system};
-          modules = [
+  in {
-            ./hosts/laptop/configuration.nix
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
-            inputs.home-manager.nixosModules.default
+    nixosConfigurations = {
-            inputs.stylix.nixosModules.stylix
+      laptop = nixpkgs.lib.nixosSystem {
-            nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
+        specialArgs = {inherit inputs;};
-          ];
+        modules = [
-        };
+          ./hosts/laptop/configuration.nix
+          inputs.home-manager.nixosModules.default
+          inputs.stylix.nixosModules.stylix
+          nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
+          (import ./overlays/ollama.nix)
+        ];
+      };
 
-        server = nixpkgs.lib.nixosSystem {
+      desktop = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs;};
-          modules = [
+        modules = [
-            ./hosts/server/configuration.nix
+          ./hosts/desktop/configuration.nix
-            inputs.home-manager.nixosModules.default
+          inputs.home-manager.nixosModules.default
-            nixos-hardware.nixosModules.system76
+          inputs.stylix.nixosModules.stylix
-          ];
+        ];
-        };
+      };
 
-        tablet = nixpkgs.lib.nixosSystem {
+      server = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs;};
-          modules = [
+        modules = [
-            ./hosts/tablet/configuration.nix
+          ./hosts/server/configuration.nix
-            inputs.home-manager.nixosModules.default
+          inputs.home-manager.nixosModules.default
-            nixos-hardware.nixosModules.microsoft-surface-pro-intel
+          nixos-hardware.nixosModules.system76
-          ];
+          (import ./overlays/ollama.nix)
-        };
+        ];
+      };
 
+      tablet = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs;};
+        modules = [
+          ./hosts/tablet/configuration.nix
+          inputs.home-manager.nixosModules.default
+          nixos-hardware.nixosModules.microsoft-surface-pro-intel
+        ];
       };
     };
+  };
 }

hosts/desktop/configuration.nix

@@ -0,0 +1,139 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./hardware-configuration.nix];
+  hardware.steam-hardware.enable = true;
+  nixpkgs.config.allowUnfree = true;
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  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 = {
+    hostName = "desktop";
+    networkmanager.enable = true;
+    firewall.enable = false;
+  };
+
+  nix = {
+    gc.automatic = true;
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+    };
+  };
+
+  services = {
+    pipewire = {
+      enable = false;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+    wivrn = {
+      enable = false;
+      defaultRuntime = true;
+      autoStart = true;
+    };
+    xserver = {
+      enable = false;
+      displayManager.gdm.enable = false;
+      desktopManager.gnome.enable = false;
+    };
+  };
+
+  stylix = {
+    enable = false;
+    autoEnable = true;
+    polarity = "light";
+    image = ../laptop/wallpaper.png;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/precious-light-warm.yaml";
+    opacity = {
+      terminal = 0.85;
+      popups = 0.75;
+      desktop = 0.75;
+    };
+    cursor = {
+      package = pkgs.adwaita-icon-theme;
+      name = "Adwaita";
+      size = 28;
+    };
+    fonts = {
+      serif = {
+        package = pkgs.nerd-fonts.iosevka;
+        name = "Iosevka NF";
+      };
+
+      sansSerif = {
+        package = pkgs.nerd-fonts.iosevka;
+        name = "Iosevka NF";
+      };
+
+      monospace = {
+        package = pkgs.nerd-fonts.iosevka;
+        name = "Iosevka NFM";
+      };
+    };
+  };
+
+  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";
+    };
+  };
+
+  #hardware = {
+  #  graphics.enable32Bit = true;
+  #};
+
+  programs = {
+    zsh.enable = true;
+    steam.enable = false;
+    gamescope.enable = false;
+    envision.enable = false;
+    corectrl.enable = false;
+  };
+
+  users.users.k = {
+    isNormalUser = true;
+    description = "k";
+    extraGroups = ["networkmanager" "wheel" "docker"];
+    packages = with pkgs; [zsh];
+    shell = pkgs.zsh;
+  };
+
+  home-manager = {
+    backupFileExtension = "bk";
+    users = {"k" = import ./home.nix;};
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.11"; # Did you read the comment?
+}

hosts/desktop/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# 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, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  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-label/nixos";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/BB87-CC45";
+      fsType = "vfat";
+    };
+
+  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
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/desktop/home.nix

@@ -0,0 +1,47 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  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
+  #  ];
+  #};
+
+  # For WiVRn:
+  #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
+  #  }
+  #'';
+}

hosts/home/gnome.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, inputs, ... }:
-
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   # ...
   dconf.settings = {
     # ...
@@ -22,4 +25,3 @@
     gnomeExtensions.search-light
   ];
 }
-

hosts/home/home_common.nix

@@ -1,11 +1,13 @@
-{ config, pkgs, inputs, ... }:
-
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   home = {
     username = "k";
     homeDirectory = "/home/k";
     stateVersion = "23.11";
-    enableNixpkgsReleaseCheck = false;
   };
   programs = {
     git = {
@@ -13,7 +15,7 @@
       userName = "k";
       userEmail = "markers711@gmail.com";
     };
-    tmux = { enable = true; };
+    tmux.enable = true;
     starship.enable = true;
     zsh = {
       enable = true;
@@ -21,16 +23,18 @@
       enableCompletion = true;
       syntaxHighlighting.enable = true;
       autocd = true;
-      plugins = [{
+      plugins = [
-        name = "zsh-nix-shell";
+        {
-        file = "nix-shell.plugin.zsh";
+          name = "zsh-nix-shell";
-        src = pkgs.fetchFromGitHub {
+          file = "nix-shell.plugin.zsh";
-          owner = "chisui";
+          src = pkgs.fetchFromGitHub {
-          repo = "zsh-nix-shell";
+            owner = "chisui";
-          rev = "v0.8.0";
+            repo = "zsh-nix-shell";
-          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+            rev = "v0.8.0";
-        };
+            sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-      }];
+          };
+        }
+      ];
     };
   };
 }

hosts/home/hyprland.nix

@@ -0,0 +1,184 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./waybar.nix ./tile.nix];
+  home.packages = with pkgs; [
+    #iio-hyprland
+    #jq #iio-hyprland needs this
+  ];
+
+  programs = {
+    hyprlock.enable = true;
+  };
+
+  services = {
+    hyprpaper.enable = true;
+    batsignal.enable = true;
+    hypridle = {
+      enable = true;
+      package = pkgs.hypridle;
+
+      settings = {
+        general = {
+          after_sleep_cmd = "hyprctl dispatch dpms on";
+          ignore_dbus_inhibit = false;
+          lock_cmd = "hyprlock";
+        };
+
+        listener = [
+          {
+            timeout = 900;
+            on-timeout = "hyprlock";
+          }
+          {
+            timeout = 1200;
+            on-timeout = "hyprctl dispatch dpms off";
+            on-resume = "hyprctl dispatch dpms on";
+          }
+        ];
+      };
+    };
+  };
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+    systemd.variables = ["--all"];
+    xwayland.enable = true;
+
+    settings = {
+      exec-once = [
+        #"${pkgs.iio-hyprland}/bin/iio-hyprland"
+        "${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
+        "${pkgs.waybar}/bin/waybar"
+        "${pkgs.hyprpaper}/bin/hyprpaper"
+      ];
+      monitor = "eDP-1,preferred,auto,1";
+      general = {
+        "$mainMod" = "SUPER";
+        layout = "master";
+        "$terminal" = "${pkgs.alacritty}/bin/alacritty";
+        "$menu" = "${pkgs.wofi}/bin/wofi --show drun";
+        gaps_in = 5;
+        gaps_out = 10;
+        border_size = 2;
+      };
+
+      decoration = {
+        rounding = 15;
+        blur = {
+          enabled = true;
+          size = 2;
+          passes = 2;
+          brightness = 1;
+          noise = 0.3;
+          new_optimizations = true;
+        };
+      };
+
+      misc = {
+        disable_autoreload = true;
+        disable_hyprland_logo = true;
+        always_follow_on_dnd = true;
+        layers_hog_keyboard_focus = true;
+        animate_manual_resizes = false;
+        enable_swallow = true;
+        focus_on_activate = true;
+        new_window_takes_over_fullscreen = 2;
+        middle_click_paste = true;
+        vfr = true;
+        vrr = 1;
+      };
+
+      input = {touchpad = {natural_scroll = true;};};
+
+      bind = [
+        # keybindings
+        "$mainMod, Return, exec, $terminal"
+        "$mainMod, D, exec, $menu"
+        "$mainMod Shift, C, killactive,"
+        "$mainMod, Space, exec, toggle_float"
+        "$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"
+        "$mainMod, up, movefocus, u"
+        "$mainMod, down, movefocus, d"
+
+        # switch workspace
+        "$mainMod, 1, workspace, 1"
+        "$mainMod, 2, workspace, 2"
+        "$mainMod, 3, workspace, 3"
+        "$mainMod, 4, workspace, 4"
+        "$mainMod, 5, workspace, 5"
+        "$mainMod, 6, workspace, 6"
+        "$mainMod, 7, workspace, 7"
+        "$mainMod, 8, workspace, 8"
+        "$mainMod, 9, workspace, 9"
+        "$mainMod, 0, workspace, 10"
+
+        # same as above, but switch to the workspace
+        "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
+        "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
+        "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
+        "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
+        "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
+        "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
+        "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
+        "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
+        "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
+        "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
+        "$mainMod CTRL, c, movetoworkspace, empty"
+
+        # window control
+        "$mainMod SHIFT, left, movewindow, l"
+        "$mainMod SHIFT, right, movewindow, r"
+        "$mainMod SHIFT, up, movewindow, u"
+        "$mainMod SHIFT, down, movewindow, d"
+        "$mainMod CTRL, left, resizeactive, -80 0"
+        "$mainMod CTRL, right, resizeactive, 80 0"
+        "$mainMod CTRL, up, resizeactive, 0 -80"
+        "$mainMod CTRL, down, resizeactive, 0 80"
+        "$mainMod ALT, left, moveactive,  -80 0"
+        "$mainMod ALT, right, moveactive, 80 0"
+        "$mainMod ALT, up, moveactive, 0 -80"
+        "$mainMod ALT, down, moveactive, 0 80"
+
+        # media and volume controls
+        # ",XF86AudioMute,exec, pamixer -t"
+        ",XF86AudioPlay,exec, playerctl play-pause"
+        ",XF86AudioNext,exec, playerctl next"
+        ",XF86AudioPrev,exec, playerctl previous"
+        ",XF86AudioStop,exec, playerctl stop"
+        ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+        ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+      ];
+
+      bindm = [
+        "$mainMod, mouse:272, movewindow"
+        "$mainMod, mouse:273, resizewindow"
+      ];
+    };
+  };
+
+  home.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = "1";
+    MOZ_USE_XINPUT2 = "1";
+    XDG_SESSION_TYPE = "wayland";
+    SDL_VIDEODRIVER = "wayland";
+    QT_QPA_PLATFORM = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    _JAVA_AWT_WM_NONREPARENTING = 1;
+  };
+}

hosts/home/sway.nix

@@ -1,7 +1,10 @@
-{ config, pkgs, inputs, ... }:
-
 {
-  imports = [ ./waybar.nix ./tile.nix ];
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./waybar.nix ./tile.nix];
 
   wayland.windowManager.sway = {
     enable = true;
@@ -11,7 +14,7 @@
       window.border = 1;
       window.titlebar = false;
       terminal = "${pkgs.alacritty}/bin/alacritty";
-      menu = "${pkgs.wofi}/bin/wofi -show drun -modi drun";
+      menu = "${pkgs.wofi}/bin/wofi --show drun";
       bars = [];
       gaps = {
         inner = 10;
@@ -29,9 +32,5 @@
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
     _JAVA_AWT_WM_NONREPARENTING = 1;
   };
-  services = {
+  services = {swayidle = {enable = true;};};
-    swayidle = { enable = true; };
-  };
-
 }
-

hosts/home/tile.nix

@@ -1,16 +1,28 @@
-{ config, pkgs, inputs, ... }:
-
 {
-
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   services = {
-    mako = { enable = true; };
+    mako = {
+      enable = true;
+      defaultTimeout = 4000;
+    };
   };
-
   programs = {
-    mako = { enable = true; };
+    alacritty = {enable = true;};
-    alacritty = { enable = true; };
+    wofi = {enable = true;};
-    swaylock = {enable = true;};
+    zathura = {enable = true;};
-    wofi = { enable = true; };
+    mpv = {enable = true;};
+    lf = {enable = true;};
   };
+  home.packages = with pkgs; [
+    brightnessctl
+    pulsemixer
+    unzip
+    zip
+    swayimg
+  ];
+  stylix.targets.wofi.enable = true; #this dosnt follow auto enable for some reson
 }
-

hosts/home/waybar.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   programs.waybar = {
     enable = true;
     systemd.enable = true;
@@ -6,11 +10,14 @@
       mainBar = {
         layer = "bottom";
         position = "bottom";
-        output = [ "eDP-1" ];
+        output = ["eDP-1"];
+        margin-left = 45;
+        margin-right = 45;
+        spacing = 15;
 
-        modules-left = [ "sway/workspaces" "sway/mode" ];
+        modules-left = ["sway/workspaces" "sway/mode" "hyprland/window"];
-        modules-center = [ "clock" ];
+        modules-center = ["clock"];
-        modules-right = [ "pulseaudio" "network" "battery" ];
+        modules-right = ["pulseaudio" "network" "battery"];
 
         cpu = {
           interval = 15;
@@ -26,47 +33,51 @@
 
         "pulseaudio" = {
           format = "{volume}% {icon}";
-          format-bluetooth = "{volume}% {icon}";
+          format-bluetooth = "{volume}% {icon} ";
-          format-muted = "";
+          format-muted = " ";
           format-icons = {
-            headphone = "";
+            headphone = " ";
-            hands-free = "";
+            hands-free = " ";
-            headset = "";
+            headset = " ";
-            phone = "";
+            phone = " ";
-            portable = "";
+            portable = " ";
-            car = "";
+            car = " ";
-            default = [ "" "" ];
+            default = [" " " "];
           };
-          scroll-step = 1;
+          #scroll-step = 1;
-          on-click = "pavucontrol";
+          #on-click = "pavucontrol";
         };
 
         backlight = {
           tooltip = false;
           format = " {}%";
           interval = 1;
-          on-scroll-up = "brightnessctl s 1515";
+          on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
-          on-scroll-down = "brightnessctl s 1";
+          on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
         };
 
         network = {
           format = "{ifname}";
-          format-wifi = "{essid} ({signalStrength}%) ";
+          format-wifi = "{essid} ({signalStrength}%)  ";
-          format-ethernet = "{ipaddr}/{cidr} 󰊗";
+          format-ethernet = "{ipaddr}/{cidr} 󰊗 ";
-          format-disconnected = "󰤮";
+          format-disconnected = "󰤮 ";
-          tooltip-format = "{ifname} via {gwaddr} 󰊗";
+          tooltip-format = "{ifname} via {gwaddr} 󰊗 ";
-          tooltip-format-wifi = "{essid} ({signalStrength}%) ";
+          tooltip-format-wifi = "{essid} ({signalStrength}%)  ";
-          tooltip-format-ethernet = "{ifname} ";
+          tooltip-format-ethernet = "{ifname}  ";
           tooltip-format-disconnected = "Disconnected";
           max-length = 50;
         };
 
         battery = {
           format = "{capacity}% {icon}";
-          "format-icons" = [ "" "" "" "" "" ];
+          "format-icons" = [" " " " " " " " " "];
         };
 
-        clock = { "format-alt" = "{:%a, %d. %b  %H:%M}"; };
+        clock = {
+          format = "{:%I:%M %p}";
+          "format-alt" = "{:%a, %d. %b  %H:%M}";
+          tooltip = false;
+        };
       };
     };
   };

hosts/laptop/configuration.nix

@@ -1,19 +1,35 @@
-{ config, pkgs, inputs, ... }:
-
 {
-  imports = [ ./hardware-configuration.nix ];
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./hardware-configuration.nix ];
 
   nixpkgs.config.allowUnfree = true;
   system.autoUpgrade.enable = true;
   time.timeZone = "America/New_York";
-  security.rtkit.enable = true;
-  security.polkit.enable = true;
-  security.pam.services.swaylock = {};
   powerManagement.enable = true;
 
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+        };
+      };
+    };
+  };
+
   nix = {
-    settings.experimental-features = [ "nix-command" "flakes" ];
+    gc.automatic = false;
-    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="];
+    };
   };
 
   networking = {
@@ -38,10 +54,18 @@
   };
 
   services = {
-    xserver = {
+    hardware.bolt = {enable = true;};
+    displayManager.ly = {
       enable = true;
-      displayManager.gdm.enable = true;
+      x11Support = false;
-      desktopManager.gnome.enable = true;
+      settings = {
+        animation = "colormix";
+        battery_id = "BAT0";
+        clear_password = true;
+        colormix_col1 = "0xA7C080";
+        colormix_col2 = "0x7FBBB3";
+        colormix_col3 = "0xE67E80";
+      };
     };
     pipewire = {
       enable = true;
@@ -50,6 +74,30 @@
       pulse.enable = true;
       jack.enable = true;
     };
+    auto-cpufreq = {
+      enable = false;
+      settings = {
+        battery = {
+          governor = "powersave";
+          turbo = "never";
+        };
+        charger = {
+          governor = "balance_performance";
+          turbo = "auto";
+        };
+      };
+    };
+    logind = {
+      lidSwitch = "suspend-then-hibernate";
+      lidSwitchExternalPower = "suspend";
+    };
+    avahi = {
+      enable = false;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    blueman.enable = true;
     fwupd.enable = true;
     printing.enable = true;
     fprintd.enable = true;
@@ -66,78 +114,82 @@
       terminal = 0.85;
       popups = 0.75;
       desktop = 0.75;
+      applications = 0.85;
     };
-
     cursor = {
       package = pkgs.adwaita-icon-theme;
       name = "Adwaita";
       size = 28;
     };
+    fonts = {
+      serif = {
+        package = pkgs.nerd-fonts.iosevka;
+        name = "Iosevka NF";
+      };
+
+      sansSerif = {
+        package = pkgs.nerd-fonts.iosevka;
+        name = "Iosevka NF";
+      };
+
+      monospace = {
+        package = pkgs.nerd-fonts.iosevka;
+        name = "Iosevka NFM";
+      };
+    };
   };
 
   hardware = {
     sensor.iio.enable = true;
-    pulseaudio.enable = false;
     graphics.enable32Bit = true;
-  };
+    graphics.extraPackages = with pkgs; [
-
+      intel-vaapi-driver
-  virtualisation.podman = {
+      intel-media-driver
-    enable = true;
+      intel-compute-runtime
-    dockerCompat = true;
+    ];
   };
 
   programs = {
-    nix-ld.enable = true;
-    nix-ld.libraries = with pkgs; [ glibc glib ];
     zsh.enable = true;
-    steam.enable = true;
+    virt-manager.enable = true;
-    steam.gamescopeSession.enable = true;
+    hyprland = {
-    gamemode.enable = true;
+      enable = true;
+    };
+  };
+
+  virtualisation = {
+    libvirtd = {enable = true;};
+    kvmgt = {enable = true;};
+    docker = {enable = true;};
   };
 
   users.users.k = {
     isNormalUser = true;
     description = "k";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"];
-    packages = with pkgs; [ zsh ];
+    packages = with pkgs; [zsh];
     shell = pkgs.zsh;
   };
 
   home-manager = {
     backupFileExtension = "bk";
-    users = { "k" = import ./home.nix; };
+    users = {"k" = import ./home.nix;};
   };
 
   environment = {
-    sessionVariables = { MOZ_USE_XINPUT2 = "1"; };
+    sessionVariables = {MOZ_USE_XINPUT2 = "1";};
-    gnome.excludePackages = (with pkgs; [
-      gnome-photos
-      gnome-tour
-      xterm
-      cheese # webcam tool
-      gnome-contacts
-      gnome-clocks
-      gnome-maps
-      geary # email reader
-      evince # document viewer
-      totem # video player
-      tali # poker game
-      iagno # go game
-      hitori # sudoku game
-      atomix # puzzle game
-    ]);
     systemPackages = with pkgs; [
-      intel-vaapi-driver
+      config.boot.kernelPackages.perf
-      intel-compute-runtime
-      intel-media-driver
-      microcodeIntel
-      neovim
     ];
   };
 
-  boot = {
+  systemd.sleep.extraConfig = ''
+    HibernateDelaySec=20m
+    SuspendState=mem
+  '';
 
-    plymouth = { enable = true; };
+  boot = {
+    plymouth = {enable = true;};
 
     consoleLogLevel = 0;
     initrd.verbose = false;
@@ -148,7 +200,6 @@
       "loglevel=3"
       "rd.systemd.show_status=false"
       "rd.udev.log_level=3"
-      "udev.log_priority=3"
     ];
     loader.timeout = 0;
   };
@@ -160,5 +211,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
-
 }

hosts/laptop/hardware-configuration.nix

@@ -1,16 +1,19 @@
 # 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, ... }:
-
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
-    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [];
-  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [];
-  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a7301069-c11f-411e-9a23-446744c3ae76";
@@ -22,8 +25,7 @@
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f";}];
-    [{ device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f"; }];
 
   # 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/laptop/home.nix

@@ -1,28 +1,35 @@
-{ config, pkgs, inputs, ... }:
-
 {
-  imports = [ ../home/home_common.nix ../home/gnome.nix ../home/sway.nix ];
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    ../home/home_common.nix
+    ../home/hyprland.nix
+  ];
 
   nixpkgs.config.allowUnfree = true;
 
   home = {
     packages = with pkgs; [
-      nerdfonts
       firefox
+      chromium #this might replace firefox
       keepassxc
       thunderbird
       blender
       vesktop
+      spotify
+      alacritty
+
       btop
       zip
-      spotify
-      spicetify-cli
-      distrobox
 
-      modrinth-app
+      prismlauncher
+      steam
+      gamescope
+
       direnv
-      emacs
-      syncthing
       texliveFull
       ispell
     ];
@@ -34,11 +41,24 @@
       enableZshIntegration = true;
       nix-direnv.enable = true;
     };
+
+    emacs = {
+      enable = true;
+      package = pkgs.emacs-pgtk.override{withTreeSitter=true;  withNativeCompilation=true;};
+      extraPackages = epkgs: [
+        epkgs.vterm
+      ];
+    };
   };
 
   services = {
     syncthing.enable = true;
-    activitywatch.enable = true;
+
+    mpd = {
+      enable = true;
+      musicDirectory = "/home/k/Music";
+    };
+
     emacs = {
       enable = true;
       defaultEditor = true;
@@ -48,5 +68,4 @@
     enable = true;
     autoEnable = true;
   };
-
 }

hosts/server/configuration.nix

@@ -1,47 +1,77 @@
-{ config, pkgs, inputs, ... }:
-
 {
-  imports = [ ./hardware-configuration.nix ./service.nix ];
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./hardware-configuration.nix ./service.nix];
   powerManagement.enable = true;
   system.autoUpgrade.enable = true;
   networking.networkmanager.enable = true;
 
   nix = {
-    settings.experimental-features = [ "nix-command" "flakes" ];
     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="];
+    };
+  };
+
+  nixpkgs.config = {
+    allowUnfree = true;
+    vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
   };
 
   programs = {
-    nix-ld.enable = true;
-    nix-ld.libraries = with pkgs; [ glibc glib ];
     zsh.enable = true;
+    neovim.enable = true;
   };
 
-  users.users.k = {
+  users = {
-    isNormalUser = true;
+    motd = "Welcome to the Server";
-    description = "k";
+    defaultUserShell = pkgs.zsh;
-    extraGroups = [ "networkmanager" "wheel" ];
+    users = {
-    packages = with pkgs; [ zsh ];
+      k = {
-    shell = pkgs.zsh;
+        isNormalUser = true;
+        description = "k";
+        extraGroups = ["networkmanager" "wheel" "libvirtd"];
+        openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKbKVe6gneJ9ghFih3bOeL++iDNPJNIMoZSdNMOsD0I k@laptop"];
+      };
+      docker = {
+        isNormalUser = true;
+        description = "user for runing docker";
+        extraGroups = ["docker"];
+        openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKbKVe6gneJ9ghFih3bOeL++iDNPJNIMoZSdNMOsD0I k@laptop"];
+        packages = with pkgs; [docker-compose];
+      };
+    };
   };
 
-  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; [
-  hardware.opengl = {
+    microcodeIntel
+    firefox
+  ];
+
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
-      intel-compute-runtime
       intel-media-driver
-      vaapiIntel
+      intel-vaapi-driver
       vaapiVdpau
-      libvdpau-va-gl
+      intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
-      vpl-gpu-rt
+      vpl-gpu-rt # QSV on 11th gen or newer
+      intel-media-sdk # QSV up to 11th gen
     ];
   };
 
-  services.xserver.videoDrivers = [ "intel" ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -49,5 +79,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
-
 }

hosts/server/hardware-configuration.nix

@@ -1,16 +1,19 @@
 # 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, ... }:
-
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [];
-  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [];
-  boot.extraModulePackages = [ ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -27,8 +30,7 @@
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/ecde85bd-abea-4926-80d5-810b01d0e364";}];
-    [{ device = "/dev/disk/by-uuid/ecde85bd-abea-4926-80d5-810b01d0e364"; }];
 
   # 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/server/home.nix

@@ -1,43 +1,12 @@
-{ config, pkgs, inputs, ... }:
-
 {
-  nixpkgs.config.allowUnfree = true;
+  config,
-
+  pkgs,
-  home = {
+  inputs,
-    username = "k";
+  ...
-    homeDirectory = "/home/k";
+}: {
-    stateVersion = "23.11";
+  imports = [../home/home_common.nix];
-    enableNixpkgsReleaseCheck = false;
+  home = {packages = with pkgs; [docker docker-compose neovim waypipe];};
-
+  services = {
-    packages = [ pkgs.neovim pkgs.btop ];
+    syncthing.enable = true;
   };
-
-  programs = {
-    git = {
-      enable = true;
-      userName = "k";
-      userEmail = "markers711@gmail.com";
-    };
-
-    starship.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";
-        };
-      }];
-    };
-  };
-
-  services.syncthing.enable = true;
 }

hosts/server/service.nix

@@ -1,29 +1,75 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  networking = {
+    firewall = {
+      enable = true;
+      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"];
+          }
 
-  networking.firewall = {
+          { # phone
-    enable = true;
+            publicKey = "vcheBoHRxCrwzbMw0UI9ZsQfVDJizBWkeM+pF5/8+HE=";
-    allowedTCPPorts = [ 80 443 22 ];
+            allowedIPs = ["10.0.0.3/32"];
+          }
+        ];
+      };
+    };
   };
 
+  networking.nat.enable = true;
+
   security.acme = {
     acceptTerms = true;
     defaults.email = "markers711@gmail.com";
   };
 
-  virtualisation.docker = { enable = true; };
+  virtualisation = {
+    docker = {enable = true;};
+    libvirtd = {enable = true;};
+    kvmgt = {enable = true;};
+  };
 
   services = {
-    openssh = { enable = true; };
+    openssh = {enable = true;};
 
-    jellyfin = { enable = true; };
+    jellyfin = {enable = true;};
 
-    fail2ban = { enable = true; };
+    fail2ban = {enable = true;};
+
+    postgresql = {enable = true;};
+
+    i2p = {enable = true;};
+
+    nix-serve = {
+      enable = true;
+      secretKeyFile = "/var/cache-priv-key.pem";
+    };
+
+    ollama = {
+      enable = false;
+      package = pkgs.ollama-intel;
+    };
 
     gitea = {
       enable = true;
       settings = {
         service.DISABLE_REGISTRATION = true;
-	service.ENABLE_PUSH_CREATE_USER = true;
+        service.ENABLE_PUSH_CREATE_USER = true;
         server = {
           HTTP_PORT = 8001;
           DOMAIN = "dhilton.xyz";
@@ -48,34 +94,58 @@
     };
 
     home-assistant = {
-      enable = true;
+      enable = false;
-      extraComponents = [ "wiz" "fail2ban" ];
+      extraComponents = ["wiz" "fail2ban" "ollama" "wyoming" "androidtv" "androidtv_remote"];
       config = {
-        default_config = { };
+        default_config = {};
         "automation ui" = "!include automations.yaml";
         http = {
           use_x_forwarded_for = "true";
-          trusted_proxies = [ "127.0.0.1" ];
+          trusted_proxies = ["127.0.0.1"];
-          server_port = 8003;
+          server_port = 8002;
         };
       };
     };
 
-    ntfy-sh = {
+    wyoming = {
-      enable = true;
+      piper.servers."piperNix" = {
-      settings = {
+        enable = false;
-        listen-http = ":8004";
+        uri = "tcp://0.0.0.0:10200";
-        auth-file = "/var/lib/ntfy.db";
+        voice = "en-us-ryan-low";
-        auth-default-access = "read-only";
+      };
-        base-url = "https://ntfy.dhilton.xyz";
+      faster-whisper.servers."whisperNix" = {
+        enable = false;
+        uri = "tcp://0.0.0.0:10300";
+        language = "en";
       };
     };
 
     searx = {
       enable = true;
       settings = {
-        server.port = 8005;
+        server.port = 8003;
         server.secret_key = "secretlol";
+        search.formats = ["html" "json"];
+      };
+    };
+
+    akkoma = {
+      enable = true;
+      initDb.enable = true;
+      config = {
+        ":pleroma" = {
+          ":instance" = {
+            name = "dhilton fedi";
+            description = "dhilton akkoma server";
+            email = "markers711@gmail.com";
+            registration_open = false;
+          };
+          "Pleroma.Web.Endpoint" = {url.host = "fed.dhilton.xyz";};
+        };
+      };
+      nginx = {
+        enableACME = true;
+        forceSSL = true;
       };
     };
 
@@ -85,7 +155,6 @@
       recommendedTlsSettings = true;
 
       virtualHosts = {
-
         "dhilton.xyz" = {
           enableACME = true;
           forceSSL = true;
@@ -101,15 +170,6 @@
           };
         };
 
-        "ntfy.dhilton.xyz" = {
-          forceSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "http://127.0.0.1:8004";
-            proxyWebsockets = true;
-          };
-        };
-
         "jel.dhilton.xyz" = {
           forceSSL = true;
           enableACME = true;
@@ -119,7 +179,7 @@
           };
         };
 
-        "puf.dhilton.xyz" = {
+        "hom.dhilton.xyz" = {
           forceSSL = true;
           enableACME = true;
           locations."/" = {
@@ -132,19 +192,23 @@
           forceSSL = true;
           enableACME = true;
           locations."/" = {
-            proxyPass = "http://127.0.0.1:8005";
+            proxyPass = "http://127.0.0.1:8003";
             proxyWebsockets = true;
           };
         };
 
-        "hom.dhilton.xyz" = {
+        "map.dhilton.xyz" = {
           forceSSL = true;
           enableACME = true;
           locations."/" = {
-            proxyPass = "http://127.0.0.1:8003";
+            proxyPass = "http://127.0.0.1:8100";
             proxyWebsockets = true;
           };
         };
+
+        "nix.dhilton.xyz" = {
+          locations."/".proxyPass = "http://127.0.0.1:5000";
+        };
       };
     };
   };

hosts/tablet/configuration.nix

@@ -1,14 +1,18 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, inputs, nixos-hardware, ... }:
-
 {
-  imports = [ # Include the results of the hardware scan.
+  config,
+  pkgs,
+  inputs,
+  nixos-hardware,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = ["nix-command" "flakes"];
   nixpkgs.config.allowUnfree = true;
 
   networking.networkmanager.enable = true;
@@ -44,13 +48,9 @@
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
-  services.auto-cpufreq.enable = true;
   services.thermald.enable = true;
-  powerManagement.powertop.enable = true;
-  powerManagement.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -69,11 +69,11 @@
   users.users.k = {
     isNormalUser = true;
     description = "k";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [ zsh ];
+    packages = with pkgs; [zsh];
     shell = pkgs.zsh;
   };
-  home-manager = { users = { "k" = import ./home.nix; }; };
+  home-manager = {users = {"k" = import ./home.nix;};};
 
   system.autoUpgrade.enable = true;
   nix.gc.automatic = true;
@@ -89,7 +89,7 @@
     neovim
   ];
 
-  boot.kernelModules = [ "soc_button_array" ];
+  boot.kernelModules = ["soc_button_array"];
 
   networking.firewall.enable = true;
 
@@ -100,5 +100,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
-
 }

hosts/tablet/hardware-configuration.nix

@@ -1,16 +1,19 @@
 # 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, ... }:
-
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
-    [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [];
-  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [];
-  boot.extraModulePackages = [ ];
 
   hardware.opengl.driSupport32Bit = true;
   networking.hostName = "surface";
@@ -29,8 +32,7 @@
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/19941c01-ac8c-4609-a834-20259f3ee32e";}];
-    [{ device = "/dev/disk/by-uuid/19941c01-ac8c-4609-a834-20259f3ee32e"; }];
 
   # 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/tablet/home.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, inputs, ... }:
-
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   home.enableNixpkgsReleaseCheck = false;
   nixpkgs.config.allowUnfree = true;
 
@@ -25,15 +28,17 @@
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     autocd = true;
-    plugins = [{
+    plugins = [
-      name = "zsh-nix-shell";
+      {
-      file = "nix-shell.plugin.zsh";
+        name = "zsh-nix-shell";
-      src = pkgs.fetchFromGitHub {
+        file = "nix-shell.plugin.zsh";
-        owner = "chisui";
+        src = pkgs.fetchFromGitHub {
-        repo = "zsh-nix-shell";
+          owner = "chisui";
-        rev = "v0.8.0";
+          repo = "zsh-nix-shell";
-        sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+          rev = "v0.8.0";
-      };
+          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-    }];
+        };
+      }
+    ];
   };
 }

overlays/ollama.nix

@@ -0,0 +1,49 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      ollama-intel = prev.ollama.overrideAttrs (oldAttrs: {
+        buildInputs =
+          oldAttrs.buildInputs
+          or []
+          ++ [prev.intel-compute-runtime.drivers];
+        propagatedBuildInputs =
+          oldAttrs.propagetedBuildInputs
+          or []
+          ++ [prev.intel-compute-runtime.drivers];
+
+        cmakeFlags = [
+          "GGML_NATIVE=true"
+          "BUILD_SHARED_LIBS=true"
+          "GGML_BLAS=true"
+          "GGML_SYCL=true"
+          "GGML_SYCL_F16=false"
+          "CMAKE_C_COMPILER=icx"
+          "CMAKE_CXX_COMPILER=icpx"
+        ];
+
+        postInstall =
+          (oldAttrs.postInstall or "")
+          + ''
+                   mkdir -p "$out/bin"
+                   cat << EOF > "$out/bin/ollama-wrapped"
+                   #!/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"
+                   mv $out/bin/ollama $out/bin/ollama-base
+                   ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama"
+          '';
+      });
+    })
+  ];
+}