flake.lock

@@ -145,11 +145,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1777851538,
+        "lastModified": 1768949235,
-        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
+        "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
+        "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1778143761,
+        "lastModified": 1769302137,
-        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
+        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
+        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777428379,
+        "lastModified": 1767799921,
-        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1778003029,
+        "lastModified": 1769318308,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+        "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+        "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1778105055,
+        "lastModified": 1769472288,
-        "narHash": "sha256-SWz0cVHEGFb2rSszCaQ7nmuM9q7Cq3xbsg+DAg0N9jo=",
+        "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "68b1ff44196f4f593d0cd837ffb2a088c2870055",
+        "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c",
         "type": "github"
       },
       "original": {

hosts/desktop/configuration.nix

@@ -15,12 +15,13 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   hardware.amdgpu.opencl.enable = true;
-  boot.kernelParams = ["amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1"];
+  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;

hosts/desktop/hardware-configuration.nix

@@ -1,33 +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,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = ["kvm-amd"];
+  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-label/nixos";
+    { device = "/dev/disk/by-label/nixos";
       fsType = "btrfs";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/BB87-CC45";
+    { device = "/dev/disk/by-uuid/BB87-CC45";
       fsType = "vfat";
     };
 
-  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/home/home_common.nix

@@ -16,14 +16,25 @@
       userEmail = "markers711@gmail.com";
     };
     tmux.enable = true;
-    nix-your-shell.enable = true;
+    starship.enable = true;
-    starship.enable = false;
     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/niri.nix

@@ -5,17 +5,10 @@
   ...
 }: {
   imports = [./waybar.nix ./tile.nix];
-  programs.swaylock.enable = true;
-
-  services.swayidle.enable = true;
-  services.polkit-gnome.enable = true;
-  services.mako.enable = true;
-
   home.packages = with pkgs; [
     pkgs.swaybg
     pkgs.swayidle
     pkgs.swaylock
-    pkgs.xwayland-satellite
     pkgs.niri
     pkgs.fuzzel
     pkgs.iio-niri

hosts/home/tile.nix

@@ -15,6 +15,7 @@
     wofi = {enable = true;};
     zathura = {enable = true;};
     mpv = {enable = true;};
+    lf = {enable = true;};
   };
   home.packages = with pkgs; [
     brightnessctl

hosts/laptop/configuration.nix

@@ -10,26 +10,11 @@
   system.autoUpgrade.enable = true;
   time.timeZone = "America/New_York";
   powerManagement.enable = true;
-  services.power-profiles-daemon.enable = false;
-  services.tlp.enable = true;
-  powerManagement.powertop.enable = true;
-
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-
-  services.tlp.settings = {
-    CPU_MAX_PERF_ON_BAT = 60;
-    CPU_BOOST_ON_BAT = 0;
-    IWLWIFI_PWR_POLICY_ON_AC = 1;
-    IWLWIFI_PWR_POLICY_ON_BAT = 2;
-  };
 
   hardware = {
     bluetooth = {
       enable = true;
-      powerOnBoot = false;
+      powerOnBoot = true;
       settings = {
         General = {
           Enable = "Source,Sink,Media,Socket";
@@ -49,10 +34,7 @@
 
   networking = {
     hostName = "laptop";
-    networkmanager = {
+    networkmanager.enable = true;
-      enable = true;
-      wifi.powersave = true;
-    };
     firewall.enable = true;
   };
 
@@ -79,7 +61,7 @@
       jack.enable = true;
     };
     auto-cpufreq = {
-      enable = false;
+      enable = true;
       settings = {
         battery = {
           governor = "powersave";
@@ -107,8 +89,27 @@
   stylix = {
     enable = true;
     autoEnable = true;
-    image = ./wallpaper.jpg;
+    polarity = "light";
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
+    image = ./wallpaper.png;
+    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;
@@ -146,12 +147,10 @@
   programs = {
     zsh.enable = true;
     niri.enable = true;
-    virt-manager.enable = true;
   };
 
   virtualisation = {
     docker = {enable = true;};
-    libvirtd = {enable = true;};
   };
 
   users.users.k = {

hosts/laptop/home.nix

@@ -35,8 +35,6 @@
       ispell
 
       calc
-      ripgrep
-      neovim
     ];
   };
 
@@ -54,12 +52,13 @@
         withNativeCompilation = true;
       };
       extraPackages = epkgs: [
+        epkgs.vterm
       ];
     };
   };
 
   services = {
-    syncthing.enable = false;
+    syncthing.enable = true;
 
     mpd = {
       enable = true;