From 55e6188abdda85c51622bb3775a9d1b2a692880a Mon Sep 17 00:00:00 2001 From: Xory Date: Wed, 7 Jan 2026 15:02:17 +0200 Subject: [PATCH 01/10] init: create minimal ver of config --- configuration.nix | 58 ++--------- home.nix | 70 -------------- hosts/nullstar/config.nix | 31 ------ hosts/nullstar/hardware/disko.nix | 96 ------------------- .../hardware/hardware-configuration.nix | 23 ----- hosts/voidspear/config.nix | 28 ------ hosts/voidspear/hardware/disko.nix | 88 ----------------- .../hardware/hardware-configuration.nix | 23 ----- 8 files changed, 9 insertions(+), 408 deletions(-) delete mode 100644 hosts/nullstar/config.nix delete mode 100644 hosts/nullstar/hardware/disko.nix delete mode 100644 hosts/nullstar/hardware/hardware-configuration.nix delete mode 100644 hosts/voidspear/config.nix delete mode 100644 hosts/voidspear/hardware/disko.nix delete mode 100644 hosts/voidspear/hardware/hardware-configuration.nix diff --git a/configuration.nix b/configuration.nix index 47f4168..b28c502 100644 --- a/configuration.nix +++ b/configuration.nix @@ -58,11 +58,11 @@ "/var/log" "/var/lib/bluetooth" "/var/lib/nixos" - "/var/lib/libvirt" - "/var/lib/ollama-models" - "/var/lib/flatpak" + # "/var/lib/libvirt" + # "/var/lib/ollama-models" + # "/var/lib/flatpak" "/var/lib/tailscale" - "/var/lib/syncthing" + # "/var/lib/syncthing" "/etc/NetworkManager/system-connections" "/etc/ssh" ]; @@ -149,26 +149,6 @@ "--env=GTK_THEME=Adwaita:dark" ]; }; - signal-desktop-bin = { - executable = "${pkgs.signal-desktop-bin}/bin/signal-desktop"; - profile = "${pkgs.firejail}/etc/firejail/signal-desktop.profile"; - extraArgs = [ - "--env=GTK_THEME=Adwaita:dark" - "--noblacklist=~/Pictures" - "--noblacklist=~/Documents" - "--whitelist=~/Pictures" - "--whitelist=~/Documents" - "--dbus-user.talk=org.freedesktop.Notifications" - "--dbus-user.talk=org.kde.StatusNotifierWatcher" - ]; - }; - obsidian = { - executable = "${pkgs.obsidian}/bin/obsidian"; - profile = "${pkgs.firejail}/etc/firejail/obsidian.profile"; - extraArgs = [ - "--env=GTK_THEME=Adwaita:dark" - ]; - }; }; }; @@ -181,11 +161,11 @@ # Enable Hyprland. programs.hyprland.enable = true; - services.flatpak.enable = true; + # services.flatpak.enable = true; # Enable CUPS to print documents. - services.printing.enable = true; - services.printing.drivers = [ pkgs.hplip ]; + # services.printing.enable = true; + # services.printing.drivers = [ pkgs.hplip ]; programs.gnupg.agent.enable = true; @@ -221,8 +201,8 @@ enable32Bit = true; }; - services.ollama.enable = true; - services.ollama.models = "/var/lib/ollama-models"; + # services.ollama.enable = true; + # services.ollama.models = "/var/lib/ollama-models"; # Enable automatic login for the user. # We temporarily keep this enabled because I plan to switch to LVM on LUKS. @@ -244,32 +224,12 @@ git ]; - programs.steam.enable = true; - nix.gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 2d"; }; - programs.virt-manager.enable = true; - virtualisation.libvirtd = { - enable = true; - qemu = { - vhostUserPackages = with pkgs; [ virtiofsd ]; - swtpm.enable = true; - }; - }; - virtualisation.spiceUSBRedirection.enable = true; - virtualisation.docker.enable = true; - - services = { - syncthing = { - enable = true; - group = "users"; - user = "xory"; - }; - }; services.openssh.enable = true; # TODO: add declarative key-based auth # Some programs need SUID wrappers, can be configured further or are diff --git a/home.nix b/home.nix index cd955d3..aa6ad14 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,6 @@ { config, pkgs, inputs, ... }: { - imports = [ inputs.spicetify-nix.homeManagerModules.default ]; home.username = "xory"; home.homeDirectory = "/home/xory"; @@ -11,39 +10,8 @@ git cava kdePackages.qtwebsockets - (python313.withPackages (python-pkgs: [ - python313Packages.websockets - python313Packages.requests # basic python test env - ])) - simplex-chat-desktop - qbittorrent - ffmpeg - yt-dlp - prismlauncher keepassxc - (wrapOBS { - plugins = with pkgs.obs-studio-plugins; [ - obs-vaapi - obs-gstreamer - obs-vkcapture - wlrobs - obs-pipewire-audio-capture - ]; - }) - mpv - kdePackages.kdenlive - gimp - inkscape - krita - distrobox screen - arduino-ide - (lutris.override { - extraLibraries = pkgs: [ - wineWowPackages.stable - winetricks - ]; - }) libadwaita # fucking winetricks zenity woeusb-ng @@ -52,13 +20,9 @@ hyprsunset grim slurp - input-leap - viber hyprpolkitagent pulsemixer feh - opentrack - aitrack progress croc libarchive @@ -111,40 +75,6 @@ eval "$(direnv hook zsh)" settings.window_padding_width = 5; }; - programs.spicetify = - let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; - in - { - enable = true; - - theme = spicePkgs.themes.catppuccin; - colorScheme = "mocha"; - - enabledExtensions = with spicePkgs.extensions; [ - hidePodcasts - shuffle - betterGenres - beautifulLyrics - ]; - - enabledCustomApps = with spicePkgs.apps; [ - newReleases - ncsVisualizer - ]; - }; - - # firejail - xdg.desktopEntries.spotify = { - name = "Spotify"; - genericName = "Music Player"; - icon = "spotify-client"; - exec = "${pkgs.firejail}/bin/firejail ${config.programs.spicetify.spicedSpotify}/bin/spotify %U"; - terminal = false; - categories = [ "Audio" "Music" "Player" "AudioVideo" ]; - mimeType = [ "x-scheme-handler/spotify" ]; - }; - wayland.windowManager.hyprland.enable = true; programs.waybar.enable = true; programs.wofi.enable = true; diff --git a/hosts/nullstar/config.nix b/hosts/nullstar/config.nix deleted file mode 100644 index 674080b..0000000 --- a/hosts/nullstar/config.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, pkgs, lib, inputs, ... }: - -{ - imports = - [ - ./hardware/hardware-configuration.nix - ./hardware/disko.nix - (inputs.nixos-hardware.nixosModules.framework-16-7040-amd) - ]; - - services.fwupd.enable = true; - - networking.hostName = "nullstar"; - networking.hostId = "322d5212"; - - # Enable FL16 Input modules - hardware.inputmodule.enable = true; - hardware.keyboard.qmk.enable = true; - - hardware.graphics.extraPackages = with pkgs; [ - libvdpau-va-gl - rocmPackages.clr.icd - ]; - - services.ollama.package = pkgs.ollama-rocm; - - environment.systemPackages = with pkgs; [ - framework-tool - inputmodule-control - ]; -} diff --git a/hosts/nullstar/hardware/disko.nix b/hosts/nullstar/hardware/disko.nix deleted file mode 100644 index b4e0acd..0000000 --- a/hosts/nullstar/hardware/disko.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # Disable this if you do not want to allow TRIM requests to pass through LUKS - # (Security vs SSD longevity trade-off) - settings.allowDiscards = true; - # Uncomment if you want to use a keyfile during install: - # settings.keyFile = "/tmp/secret.key"; - content = { - type = "zfs"; - pool = "zroot"; - }; - }; - }; - }; - }; - }; - }; - zpool = { - zroot = { - type = "zpool"; - options = { - ashift = "12"; - autotrim = "on"; - }; - rootFsOptions = { - acltype = "posixacl"; - xattr = "sa"; - dnodesize = "auto"; - compression = "zstd"; - normalization = "formD"; - relatime = "on"; - canmount = "off"; - # Prevent auto-snapshotting by default (enable explicitly on datasets that need it) - "com.sun:auto-snapshot" = "false"; - }; - datasets = { - # The ephemeral root dataset. - # We create a blank snapshot immediately so you can rollback to it on boot. - "root" = { - type = "zfs_fs"; - mountpoint = "/"; - options.mountpoint = "legacy"; - postCreateHook = "zfs snapshot zroot/root@blank"; - }; - - # The Nix Store (reproducible, doesn't need backing up usually) - "nix" = { - type = "zfs_fs"; - mountpoint = "/nix"; - options.mountpoint = "legacy"; - options."com.sun:auto-snapshot" = "false"; - }; - - # Persisted state (for impermanence) - "persist" = { - type = "zfs_fs"; - mountpoint = "/persist"; - options.mountpoint = "legacy"; - # Enable snapshots for data safety if using sanoid/syncoid - # options."com.sun:auto-snapshot" = "true"; - }; - - # Home directories - "home" = { - type = "zfs_fs"; - mountpoint = "/home"; - options.mountpoint = "legacy"; - # options."com.sun:auto-snapshot" = "true"; - }; - }; - }; - }; - }; -} diff --git a/hosts/nullstar/hardware/hardware-configuration.nix b/hosts/nullstar/hardware/hardware-configuration.nix deleted file mode 100644 index 72e9c1e..0000000 --- a/hosts/nullstar/hardware/hardware-configuration.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/voidspear/config.nix b/hosts/voidspear/config.nix deleted file mode 100644 index 31173ec..0000000 --- a/hosts/voidspear/config.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, inputs, ... }: - -{ - imports = [ - ./hardware/hardware-configuration.nix - ./hardware/disko.nix - ]; - - networking.hostName = "voidspear"; - networking.hostID = "ec82a76e"; - - - # nVidia drivers. - hardware.graphics.extraPackages = with pkgs; [ - libvdpau-va-gl - ]; - services.xserver.videoDrivers = [ "nvidia"]; - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = false; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; - boot.blacklistedKernelModules = [ "nouveau" ]; - - services.ollama.package = pkgs.ollama-cuda; -} diff --git a/hosts/voidspear/hardware/disko.nix b/hosts/voidspear/hardware/disko.nix deleted file mode 100644 index fc8c217..0000000 --- a/hosts/voidspear/hardware/disko.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # Critical for Samsung NVMe longevity/performance - settings.allowDiscards = true; - content = { - type = "zfs"; - pool = "zroot"; - }; - }; - }; - }; - }; - }; - }; - zpool = { - zroot = { - type = "zpool"; - options = { - ashift = "12"; - autotrim = "on"; - }; - rootFsOptions = { - acltype = "posixacl"; - xattr = "sa"; - dnodesize = "auto"; - compression = "zstd"; - normalization = "formD"; - relatime = "on"; - canmount = "off"; - "com.sun:auto-snapshot" = "false"; - }; - datasets = { - # Ephemeral root (rolls back to blank on boot) - "root" = { - type = "zfs_fs"; - mountpoint = "/"; - options.mountpoint = "legacy"; - postCreateHook = "zfs snapshot zroot/root@blank"; - }; - - # Nix store - "nix" = { - type = "zfs_fs"; - mountpoint = "/nix"; - options.mountpoint = "legacy"; - options."com.sun:auto-snapshot" = "false"; - }; - - # Persistent data - "persist" = { - type = "zfs_fs"; - mountpoint = "/persist"; - options.mountpoint = "legacy"; - }; - - # Home directories - "home" = { - type = "zfs_fs"; - mountpoint = "/home"; - options.mountpoint = "legacy"; - }; - }; - }; - }; - }; -} diff --git a/hosts/voidspear/hardware/hardware-configuration.nix b/hosts/voidspear/hardware/hardware-configuration.nix deleted file mode 100644 index 53f8354..0000000 --- a/hosts/voidspear/hardware/hardware-configuration.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} From 59eea24408c6f27cb8c6cd2aa347fd9a3f7bf4a8 Mon Sep 17 00:00:00 2001 From: Xory Date: Wed, 14 Jan 2026 14:54:56 +0200 Subject: [PATCH 02/10] bump: flake update --- flake.lock | 81 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 518618c..bce5593 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,32 @@ ] }, "locked": { - "lastModified": 1767437240, - "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=", + "lastModified": 1768366276, + "narHash": "sha256-NUdsaB6H1wvbOC7oh1UZ7Ojg1I+mYBQv8ovlMB6FbHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012", + "rev": "4e235a8746b195e335306d898f0cc93ad6c4564c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -41,12 +62,16 @@ } }, "impermanence": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1767822991, + "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", "type": "github" }, "original": { @@ -72,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -88,11 +113,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767325753, - "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", + "lastModified": 1768242861, + "narHash": "sha256-F4IIxa5xDHjtrmMcayM8lHctUq1oGltfBQu2+oqDWP4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", + "rev": "1327e798cb055f96f92685df444e9a2c326ab5ed", "type": "github" }, "original": { @@ -104,11 +129,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -124,22 +165,22 @@ "home-manager": "home-manager", "impermanence": "impermanence", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems" }, "locked": { - "lastModified": 1767195736, - "narHash": "sha256-0xvPSbhIGeJzsJXNTkgJ3PjwdVItKm85wzYKA9NmSzI=", + "lastModified": 1768107098, + "narHash": "sha256-mSthw4k7jkB5S8+NYZwrQFItLj+17Se7Wn0pIfdASbc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "465adc0ab6ff0c4b9b1db1c6e7fd7eeb553b3261", + "rev": "2e40e07527f9d724b1578f0af590ab345e836ec3", "type": "github" }, "original": { From ca4f9a6e9ab72295a84d7c4a2e1314861d011d2f Mon Sep 17 00:00:00 2001 From: Xory Date: Sun, 25 Jan 2026 12:13:10 +0200 Subject: [PATCH 03/10] nix flake update, god help us --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index bce5593..368082d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1768366276, - "narHash": "sha256-NUdsaB6H1wvbOC7oh1UZ7Ojg1I+mYBQv8ovlMB6FbHk=", + "lastModified": 1769289524, + "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e235a8746b195e335306d898f0cc93ad6c4564c", + "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767822991, - "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", + "lastModified": 1768941735, + "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", "owner": "nix-community", "repo": "impermanence", - "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", + "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -97,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768242861, - "narHash": "sha256-F4IIxa5xDHjtrmMcayM8lHctUq1oGltfBQu2+oqDWP4=", + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1327e798cb055f96f92685df444e9a2c326ab5ed", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -145,11 +145,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1768107098, - "narHash": "sha256-mSthw4k7jkB5S8+NYZwrQFItLj+17Se7Wn0pIfdASbc=", + "lastModified": 1769316930, + "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2e40e07527f9d724b1578f0af590ab345e836ec3", + "rev": "b2ce438f386943ef611e196a178af2d79042903b", "type": "github" }, "original": { From 77167cd65fb2c61d169cbf462075ebd1c3dd1489 Mon Sep 17 00:00:00 2001 From: Xory Date: Thu, 29 Jan 2026 21:08:42 +0200 Subject: [PATCH 04/10] flake update + nvchad --- configuration.nix | 2 +- flake.lock | 105 +++++++++++++++++++++++++++++++++++++++------- flake.nix | 8 +++- home.nix | 15 +++---- 4 files changed, 104 insertions(+), 26 deletions(-) diff --git a/configuration.nix b/configuration.nix index 47f4168..a37e163 100644 --- a/configuration.nix +++ b/configuration.nix @@ -119,7 +119,7 @@ enable = true; wrappedBinaries = { vesktop = { - executable = "${pkgs-stable.vesktop}/bin/vesktop"; + executable = "${pkgs.vesktop}/bin/vesktop"; profile = "${pkgs.firejail}/etc/firejail/vesktop.profile"; extraArgs = [ "--ignore=dbus-system" diff --git a/flake.lock b/flake.lock index 368082d..2ac5a16 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768923567, - "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -20,6 +20,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -27,11 +45,11 @@ ] }, "locked": { - "lastModified": 1769289524, - "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", + "lastModified": 1769699427, + "narHash": "sha256-dAQt3qXugGhg92A+jqaUcmH0elbgEN/mV4vy1+ohLZk=", "owner": "nix-community", "repo": "home-manager", - "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", + "rev": "2a08ab21abc8b482f41c521b5f9b0df5b18a67eb", "type": "github" }, "original": { @@ -67,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768941735, - "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -80,6 +98,28 @@ "type": "github" } }, + "nix4nvchad": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "nvchad-starter": "nvchad-starter" + }, + "locked": { + "lastModified": 1769660296, + "narHash": "sha256-y5HtWU7aNNVKUioc4+HBhySFTFMBrlDch9nE94l00uA=", + "owner": "nix-community", + "repo": "nix4nvchad", + "rev": "fdad059e50cda9aa6c5cf340c207099ad21aa5d8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix4nvchad", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1769302137, @@ -113,11 +153,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { @@ -129,11 +169,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -159,11 +199,29 @@ "type": "github" } }, + "nvchad-starter": { + "flake": false, + "locked": { + "lastModified": 1753939018, + "narHash": "sha256-xdLr6tlU9uA+wu0pqha2br0fdVm+1MjgjbB5awz9ICU=", + "owner": "NvChad", + "repo": "starter", + "rev": "e3572e1f5e1c297212c3deeb17b7863139ce663e", + "type": "github" + }, + "original": { + "owner": "NvChad", + "ref": "main", + "repo": "starter", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", + "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", @@ -173,7 +231,7 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_3", - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1769316930, @@ -203,6 +261,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c85379c..979ad72 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,14 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - impermanence.url = "github:nix-community/impermanence"; + impermanence.url = "github:nix-community/impermanence"; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + + nix4nvchad = { + url = "github:nix-community/nix4nvchad"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home.nix b/home.nix index cd955d3..fbd80ae 100644 --- a/home.nix +++ b/home.nix @@ -1,12 +1,12 @@ { config, pkgs, inputs, ... }: { - imports = [ inputs.spicetify-nix.homeManagerModules.default ]; + imports = [ inputs.spicetify-nix.homeManagerModules.default inputs.nix4nvchad.homeManagerModule ]; home.username = "xory"; home.homeDirectory = "/home/xory"; home.packages = with pkgs; [ - neovim + # neovim fastfetch git cava @@ -31,7 +31,6 @@ ]; }) mpv - kdePackages.kdenlive gimp inkscape krita @@ -65,10 +64,10 @@ ]; home.file = { - ".config/nvim/init.lua" = { - enable = true; - source = ./config/nvim/init.lua; - }; + # ".config/nvim/init.lua" = { + # enable = true; + # source = ./config/nvim/init.lua; + # }; ".config/hypr" = { enable = true; recursive = true; @@ -145,6 +144,8 @@ eval "$(direnv hook zsh)" mimeType = [ "x-scheme-handler/spotify" ]; }; + programs.nvchad.enable = true; + wayland.windowManager.hyprland.enable = true; programs.waybar.enable = true; programs.wofi.enable = true; From 9786fb8aff2bd65e5bd448c969739c244fd00d53 Mon Sep 17 00:00:00 2001 From: Xory Date: Thu, 5 Feb 2026 18:22:46 +0200 Subject: [PATCH 05/10] add vscode --- home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home.nix b/home.nix index fbd80ae..5752c00 100644 --- a/home.nix +++ b/home.nix @@ -145,6 +145,7 @@ eval "$(direnv hook zsh)" }; programs.nvchad.enable = true; + programs.vscode.enable = true; wayland.windowManager.hyprland.enable = true; programs.waybar.enable = true; From b31e61479836df0333cf9a5b60b296964137abea Mon Sep 17 00:00:00 2001 From: Xory Date: Thu, 5 Feb 2026 18:23:13 +0200 Subject: [PATCH 06/10] firewall tweaks --- configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index a37e163..eee6997 100644 --- a/configuration.nix +++ b/configuration.nix @@ -283,8 +283,8 @@ # List services that you want to enable: # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 8000 8080 25565 ]; - networking.firewall.allowedUDPPorts = [ 8000 8080 ]; + networking.firewall.allowedTCPPorts = [ 8000 8080 25565 5173 5174 ]; + networking.firewall.allowedUDPPorts = [ 8000 8080 5173 5174 ]; # Or disable the firewall altogether. # networking.firewall.enable = false; nix.settings.experimental-features = [ "nix-command" "flakes" ]; From 67ba50392414643594b22d22fbdff5f1a0381685 Mon Sep 17 00:00:00 2001 From: Xory Date: Sat, 7 Feb 2026 19:20:38 +0200 Subject: [PATCH 07/10] debloat tweak for python testenv --- home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home.nix b/home.nix index 5752c00..9496482 100644 --- a/home.nix +++ b/home.nix @@ -12,7 +12,6 @@ cava kdePackages.qtwebsockets (python313.withPackages (python-pkgs: [ - python313Packages.websockets python313Packages.requests # basic python test env ])) simplex-chat-desktop From f1a7b91babc7eae11994050cc8225abfc6a583e8 Mon Sep 17 00:00:00 2001 From: Xory Date: Mon, 9 Feb 2026 15:57:25 +0200 Subject: [PATCH 08/10] nix flake update 2 --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2ac5a16..b9a2e46 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1769699427, - "narHash": "sha256-dAQt3qXugGhg92A+jqaUcmH0elbgEN/mV4vy1+ohLZk=", + "lastModified": 1770491427, + "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a08ab21abc8b482f41c521b5f9b0df5b18a67eb", + "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nvchad-starter": "nvchad-starter" }, "locked": { - "lastModified": 1769660296, - "narHash": "sha256-y5HtWU7aNNVKUioc4+HBhySFTFMBrlDch9nE94l00uA=", + "lastModified": 1770525359, + "narHash": "sha256-l8JfOrAPUsJ3Gr+JR56RxpzV9gwL9U7xIFfJt8c1a/Y=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "fdad059e50cda9aa6c5cf340c207099ad21aa5d8", + "rev": "df0761ff98ba2f49034ba9edc0f96ee499e602c9", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769316930, - "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", + "lastModified": 1770528352, + "narHash": "sha256-KO51BALxgLUlhg1CqQgA3Rj8vgAcDvoLxzNLTxD65cc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b2ce438f386943ef611e196a178af2d79042903b", + "rev": "9f4ab243968118026f4ff82f7ce41d30319e2bf0", "type": "github" }, "original": { From 163ff9a77cdc7bff2213e752f15828186ee12caa Mon Sep 17 00:00:00 2001 From: Xory Date: Tue, 10 Feb 2026 13:26:47 +0200 Subject: [PATCH 09/10] waybar tweak --- config/waybar/style.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/waybar/style.css b/config/waybar/style.css index d5fac5b..d50fc88 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -7,7 +7,8 @@ } window#waybar { - background-color: @base; + background-color: rgba(0, 0, 0, 0); + margin-top: 5px; color: @text; transition-property: background-color; transition-duration: .5s; @@ -85,7 +86,8 @@ label:focus { #language, #battery, #clock, -#tray { +#tray, +#window { background-color: @mantle; padding: 5px; margin: 3px; From 1e346398153334a61167aff15adc335d16550803 Mon Sep 17 00:00:00 2001 From: Xory Date: Mon, 23 Feb 2026 11:31:51 +0200 Subject: [PATCH 10/10] nix flake update --- flake.lock | 48 +++++++++++++++++++-------------------- home.nix | 2 +- hosts/nullstar/config.nix | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index b9a2e46..d08d2e3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1770491427, - "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", + "lastModified": 1771756436, + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nvchad-starter": "nvchad-starter" }, "locked": { - "lastModified": 1770525359, - "narHash": "sha256-l8JfOrAPUsJ3Gr+JR56RxpzV9gwL9U7xIFfJt8c1a/Y=", + "lastModified": 1771479716, + "narHash": "sha256-px2OOCb6VDEGNSVpFEbVLnocz34qrfAarx28lTzrWsw=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "df0761ff98ba2f49034ba9edc0f96ee499e602c9", + "rev": "5098052557a36a148c84740733c4ac5b1bc566a5", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1771714954, + "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770528352, - "narHash": "sha256-KO51BALxgLUlhg1CqQgA3Rj8vgAcDvoLxzNLTxD65cc=", + "lastModified": 1771737804, + "narHash": "sha256-7wn9qbzIQQgH8tnq4VwzuWEqEWpekuymlLyhY3vM/j8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "9f4ab243968118026f4ff82f7ce41d30319e2bf0", + "rev": "6dd43010ac2458cc56a6ac5250349b9217a7a2ae", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 9496482..3fb19eb 100644 --- a/home.nix +++ b/home.nix @@ -38,7 +38,7 @@ arduino-ide (lutris.override { extraLibraries = pkgs: [ - wineWowPackages.stable + wineWow64Packages.stable winetricks ]; }) diff --git a/hosts/nullstar/config.nix b/hosts/nullstar/config.nix index 674080b..6e5a043 100644 --- a/hosts/nullstar/config.nix +++ b/hosts/nullstar/config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, pkgs, pkgs-stable, lib, inputs, ... }: { imports = @@ -22,7 +22,7 @@ rocmPackages.clr.icd ]; - services.ollama.package = pkgs.ollama-rocm; + services.ollama.package = pkgs-stable.ollama-rocm; environment.systemPackages = with pkgs; [ framework-tool