From 15ef1885f755946812f4279b3cc2825d89fd6c7e Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Mon, 12 Jan 2026 02:06:01 -0800 Subject: [PATCH] nix: update --- flake.lock | 50 ++++++++++++++++++------------------ flake.nix | 26 +++++++++++++++++++ modules/overlay-pkgs/tws.nix | 2 +- modules/system.nix | 2 +- modules/user/dev-support.nix | 2 +- 5 files changed, 54 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 486a656..ef1c06b 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1767198468, - "narHash": "sha256-FxDbqVgsT/ofpcVD4oNSO4YyPK0bu0/w4TGr/p87E4A=", + "lastModified": 1768182537, + "narHash": "sha256-1Ff3WJ57qPtX8D5srMKzXbsWD+bmC0sZzWIIRdAkmNo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff02fe1802aa90146fe3c236ec504c788825b152", + "rev": "35a115b97a6dfc196cc479c676556ce3c874ee81", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767907620, - "narHash": "sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc+ThpSSHm90s=", + "lastModified": 1768144432, + "narHash": "sha256-6fc6FyEmfwT1Ke+2ib/80XPshc1h2lapIB/HlsaxyP4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6", + "rev": "fbf421df889ceff3bac08a9f4b9493def5eecc4d", "type": "github" }, "original": { @@ -335,11 +335,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1767983607, + "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { @@ -555,11 +555,11 @@ ] }, "locked": { - "lastModified": 1767202981, - "narHash": "sha256-XF68CQaLfPcCk5DVAP/OLbyqchc9uj4E65AEf363HI8=", + "lastModified": 1768203973, + "narHash": "sha256-bf+HggwDgQRt47maAe9fbv2sH6uwZnzVy4tTb2nonP8=", "owner": "nix-community", "repo": "NUR", - "rev": "8666a7d3d9d26a7a3031ba4d5688ba4e6f83d6bd", + "rev": "7a7b3e1d25b93474d988915412e69c6f2401a0b7", "type": "github" }, "original": { @@ -598,11 +598,11 @@ ] }, "locked": { - "lastModified": 1767949765, - "narHash": "sha256-sb9X1evrQI2+4qmYCCAHMSiJFqj4eAuZp5BwYrOiJmA=", + "lastModified": 1768204289, + "narHash": "sha256-aXPr9W8AEmPz9+dH8CHIwrppKIjtS3mHyOXR2ppH/aw=", "ref": "refs/heads/master", - "rev": "eecc2f88b3b12a672df79e74f2bd49ef65f0abdf", - "revCount": 721, + "rev": "db37dc580afc9db1bc598436649c650138b6166d", + "revCount": 723, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, @@ -631,11 +631,11 @@ }, "stable": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4bc5921..c296088 100755 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,18 @@ inputs.hyprland.follows = "hyprland"; }; + /*hyprqt6engine = { + url = "github:hyprwm/hyprqt6engine"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.hyprutils.follows = "hyprutils"; + inputs.hyprlang.follows = "hyprlang"; + };*/ + + /*qt6engine = { + url = "github:kosslan/qt6engine"; + inputs.nixpkgs.follows = "nixpkgs"; + };*/ + quickshell = { url = "git+https://git.outfoxxed.me/quickshell/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; @@ -79,6 +91,7 @@ ./modules/hyprland ./modules/xserver ./systems/msi + #(inputs.vps-testing.nixosConfigurations.localHostModule) ]; }; @@ -95,6 +108,19 @@ ]; }; + userland = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + specialArgs = { inherit self system inputs; }; + + modules = [ + ./modules/impurity.nix + ./modules/preserve-system.nix + ./modules/system.nix + ./modules/hyprland + ./systems/userland + ]; + }; + msi-impure = self.nixosConfigurations.msi.extendModules { modules = [ { impurity.enable = true; } ]; }; lenovo-impure = self.nixosConfigurations.lenovo.extendModules { modules = [ { impurity.enable = true; } ]; }; }; diff --git a/modules/overlay-pkgs/tws.nix b/modules/overlay-pkgs/tws.nix index 1cc42a5..871f076 100644 --- a/modules/overlay-pkgs/tws.nix +++ b/modules/overlay-pkgs/tws.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download2.interactivebrokers.com/installers/tws/latest-standalone/tws-latest-standalone-linux-x64.sh"; - hash = "sha256-QN7dSe+R2kfDjtJWa9TIGbc8zCSC3XNmxSxOZOjOB2o="; + hash = "sha256-c+PptydEHvVkntDzX1Eod06hSE7prhuoXiTFZK+7dTI="; }; nativeBuildInputs = [ diff --git a/modules/system.nix b/modules/system.nix index e3c32f3..aebdc34 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -22,6 +22,7 @@ git git-lfs vim + android-tools ]; services.ntp.enable = true; @@ -69,7 +70,6 @@ # removable disks in file manager services.udisks2.enable = true; - programs.adb.enable = true; users.users.${config.main-user}.extraGroups = [ "adbusers" ]; services.tailscale.enable = true; diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix index 41ba047..3109db6 100644 --- a/modules/user/dev-support.nix +++ b/modules/user/dev-support.nix @@ -7,7 +7,7 @@ typescript-language-server astro-language-server haskell-language-server - glslls + #glslls zls eslint