clean up

update flake
Updated formating
2026-01-28 01:02:43 -05:00 · 2026-01-28 01:02:43 -05:00 · 2026-01-28 01:02:43 -05:00 · 2026-01-28 01:02:43 -05:00 · 2026-01-28 01:02:43 -05:00 · 2025-12-20 02:34:03 +00:00
11 changed files with 227 additions and 192 deletions
--- a/flake.lock
+++ b/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": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
        "type": "github"
      },
      "original": {
@@ -70,11 +71,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1748383148,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "lastModified": 1764873433,
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
        "type": "github"
      },
      "original": {
@@ -91,11 +92,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
        "type": "github"
      },
      "original": {
@@ -123,18 +124,20 @@
    "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": {
@@ -142,27 +145,27 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1753592768,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "lastModified": 1768949235,
+        "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1753122741,
-        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
+        "lastModified": 1769302137,
+        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
+        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
        "type": "github"
      },
      "original": {
@@ -174,48 +177,48 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1753489912,
-        "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=",
+        "lastModified": 1769318308,
+        "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701",
+        "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1751211869,
-        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -229,15 +232,14 @@
        "nixpkgs": [
          "stylix",
          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
+        ]
      },
      "locked": {
-        "lastModified": 1751320053,
-        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
+        "lastModified": 1767886815,
+        "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
+        "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef",
        "type": "github"
      },
      "original": {
@@ -273,16 +275,16 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1753733105,
-        "narHash": "sha256-zxAiwoYqjesNbV46vGZe9ONvazQDPswnHfhsvvzqkU4=",
+        "lastModified": 1769472288,
+        "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "8340949b7cba126b6939ae588e6619f8e23bba9d",
+        "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c",
        "type": "github"
      },
      "original": {
        "owner": "danth",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "stylix",
        "type": "github"
      }
@@ -338,11 +340,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "lastModified": 1767817087,
+        "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "bd99656235aab343e3d597bf196df9bc67429507",
        "type": "github"
      },
      "original": {
@@ -354,11 +356,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1751159871,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "lastModified": 1767489635,
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
        "type": "github"
      },
      "original": {
@@ -370,11 +372,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1751158968,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "lastModified": 1767488740,
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
        "type": "github"
      },
      "original": {
@@ -382,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",
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
  description = "Nixos config flake";

  inputs = {
-    stylix.url = "github:danth/stylix/release-25.05";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    home-manager.url = "github:nix-community/home-manager/release-25.05";
+    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";
  };

@@ -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)
        ];
      };

--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -18,6 +18,9 @@
  boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1" ];
  services.openssh = {enable = true;};

+  virtualisation.docker.enable = true;
+  virtualisation.docker.storageDriver = "btrfs";
+

  networking = {
    hostName = "desktop";
@@ -34,14 +37,14 @@

  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;
    };
@@ -53,7 +56,7 @@
  };

  stylix = {
-    enable = true;
+    enable = false;
    autoEnable = true;
    polarity = "light";
    image = ../laptop/wallpaper.png;
@@ -107,16 +110,16 @@

  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;
  };
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -6,42 +6,42 @@
 }: {
  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
+  #  }
+  #'';
 }
--- a/hosts/home/hyprland.nix
+++ b/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"
--- a/hosts/home/niri.nix
+++ b/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
+  ];
+}
--- a/hosts/laptop/configuration.nix
+++ b/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,28 +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.sddm = {
+    displayManager.ly = {
      enable = true;
-      wayland.enable = true;
+      x11Support = false;
+      settings = {
+        animation = "colormix";
+        battery_id = "BAT0";
+        clear_password = true;
+        colormix_col1 = "0xffffea";
+        colormix_col2 = "0x006600";
+        colormix_col3 = "0x8888cc";
+      };
    };
-    desktopManager.plasma6.enable = true;
    pipewire = {
      enable = true;
      alsa.enable = true;
@@ -68,7 +61,7 @@
      jack.enable = true;
    };
    auto-cpufreq = {
-      enable = false;
+      enable = true;
      settings = {
        battery = {
          governor = "powersave";
@@ -84,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;
@@ -102,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;
@@ -133,16 +142,15 @@

  hardware = {
    sensor.iio.enable = true;
-    graphics.enable32Bit = true;
-    graphics.extraPackages = with pkgs; [
-      intel-vaapi-driver
-      intel-media-driver
-      intel-compute-runtime
-    ];
  };

  programs = {
    zsh.enable = true;
+    niri.enable = true;
+  };
+
+  virtualisation = {
+    docker = {enable = true;};
  };

  users.users.k = {
@@ -166,7 +174,7 @@
  };

  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=30m
+    HibernateDelaySec=20m
    SuspendState=mem
  '';

@@ -182,7 +190,6 @@
      "loglevel=3"
      "rd.systemd.show_status=false"
      "rd.udev.log_level=3"
-      "udev.lqog_priority=3"
    ];
    loader.timeout = 0;
  };
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -6,6 +6,7 @@
 }: {
  imports = [
    ../home/home_common.nix
+    ../home/niri.nix
  ];

  nixpkgs.config.allowUnfree = true;
@@ -13,12 +14,14 @@
  home = {
    packages = with pkgs; [
      firefox
+      lagrange
      chromium #this might replace firefox
      keepassxc
      thunderbird
      blender
      vesktop
      spotify
+      alacritty

      btop
      zip
@@ -30,6 +33,8 @@
      direnv
      texliveFull
      ispell
+
+      calc
    ];
  };

@@ -42,7 +47,10 @@

    emacs = {
      enable = true;
-      package = pkgs.emacs-pgtk;
+      package = pkgs.emacs-pgtk.override {
+        withTreeSitter = true;
+        withNativeCompilation = true;
+      };
      extraPackages = epkgs: [
        epkgs.vterm
      ];
@@ -60,11 +68,11 @@
    emacs = {
      enable = true;
      defaultEditor = true;
-      package = pkgs.emacs-pgtk;
    };
  };
  stylix = {
    enable = true;
    autoEnable = true;
+    targets.gnome.enable = false;
  };
 }
--- a/hosts/laptop/wallpaper.png
+++ b/hosts/laptop/wallpaper.png
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -30,7 +30,7 @@

  users = {
    motd = "Welcome to the Server";
-    defaultUserShell = pkgs.nushell;
+    defaultUserShell = pkgs.zsh;
    users = {
      k = {
        isNormalUser = true;
@@ -48,16 +48,14 @@
    };
  };

-  home-manager = {users = {"k" = import ./home.nix;};};
+  home-manager = {
+    backupFileExtension = "bk";
+    users = {"k" = import ./home.nix;};
+  };

  environment.systemPackages = with pkgs; [
    microcodeIntel
    firefox
-    (pkgs.kodi.withPackages (kodiPkgs:
-      with kodiPkgs; [
-        jellyfin
-        youtube
-      ]))
  ];

  hardware.bluetooth.enable = true;
--- a/hosts/server/service.nix
+++ b/hosts/server/service.nix
@@ -6,11 +6,35 @@
  networking = {
    firewall = {
      enable = true;
-      allowedTCPPorts = [80 443 22 25565 26615 8080];
-      allowedUDPPorts = [26615 8080 1900];
+      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;
    defaults.email = "markers711@gmail.com";
@@ -33,22 +57,13 @@

    i2p = {enable = true;};

-    cockpit = {
-      enable = true;
-      allowed-origins = ["https://pit.dhilton.xyz"];
-    };
-
-    pulseaudio = {
-      enable = true;
-    };
-
    nix-serve = {
      enable = true;
      secretKeyFile = "/var/cache-priv-key.pem";
    };

    ollama = {
-      enable = true;
+      enable = false;
      package = pkgs.ollama-intel;
    };

@@ -81,7 +96,7 @@
    };

    home-assistant = {
-      enable = true;
+      enable = false;
      extraComponents = ["wiz" "fail2ban" "ollama" "wyoming" "androidtv" "androidtv_remote"];
      config = {
        default_config = {};
@@ -96,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";
      };
@@ -184,11 +199,11 @@
          };
        };

-        "pit.dhilton.xyz" = {
+        "map.dhilton.xyz" = {
          forceSSL = true;
          enableACME = true;
          locations."/" = {
-            proxyPass = "http://127.0.0.1:9090";
+            proxyPass = "http://127.0.0.1:8100";
            proxyWebsockets = true;
          };
        };
Author	SHA1	Message	Date
k	6b669988f0	clean up Some checks failed Verify Nix Flake / verify_build (push) Failing after 56s Details	2026-01-28 01:02:43 -05:00
k	ae74da869a	update flake	2026-01-28 01:02:43 -05:00
k	f8eccabdb3	Updated formating	2026-01-28 01:02:43 -05:00
k	07fd3a6afc	Changed colors	2026-01-28 01:02:43 -05:00
k	64e97bd330	Changed to niri	2026-01-28 01:02:43 -05:00
k	52569da057	Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs Some checks failed Verify Nix Flake / verify_build (push) Failing after 1m11s Details	2025-12-20 02:34:03 +00:00
k	b7ff106a25	disabled homeassistent	2025-12-20 02:33:57 +00:00
k	ecd325b830	removed unimportant packages Some checks failed Verify Nix Flake / verify_build (push) Failing after 1m1s Details	2025-12-15 21:05:54 +00:00
k	52e7d921d6	Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs	2025-12-13 19:05:33 +00:00
k	567f8ca405	add docker	2025-12-13 19:05:29 +00:00
k	4f5a315521	added some emacs bindings Some checks failed Verify Nix Flake / verify_build (push) Failing after 1m2s Details	2025-12-10 00:27:49 -05:00
k	a6496a874d	switched to hyprland	2025-12-09 23:09:31 -05:00
k	7fea267494	changed style	2025-12-09 23:09:03 -05:00
k	d668ea2616	update to 25.11	2025-12-09 23:08:03 -05:00
k	0fc551c8c5	update All checks were successful Verify Nix Flake / verify_build (push) Successful in 1m42s Details	2025-12-03 12:40:13 -05:00
k	f17f1de522	spesify more emacs	2025-12-03 12:40:13 -05:00
k	c78505aa09	enable virt	2025-12-03 12:40:13 -05:00
k	3cd724436b	useing gnome	2025-12-03 12:40:13 -05:00
k	c183a0a551	Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs Some checks failed Verify Nix Flake / verify_build (push) Has been cancelled Details	2025-12-03 17:38:52 +00:00
k	c0a1f5495f	current config	2025-12-03 17:38:31 +00:00