diff options
| -rw-r--r-- | flake.lock | 211 | ||||
| -rw-r--r-- | hosts/local/gui.nix | 20 | ||||
| -rw-r--r-- | hosts/local/i3.nix | 3 | ||||
| -rw-r--r-- | hosts/local/master/configuration.nix | 6 | ||||
| -rw-r--r-- | hosts/local/master/keyboard.nix | 19 | ||||
| -rw-r--r-- | hosts/local/nvidia.nix | 12 | ||||
| -rw-r--r-- | hosts/pkgs.nix | 4 |
7 files changed, 95 insertions, 180 deletions
@@ -63,33 +63,6 @@ "type": "github" } }, - "dankMaterialShell": { - "inputs": { - "dgop": [ - "dgop" - ], - "dms-cli": [ - "dms-cli" - ], - "nixpkgs": [ - "nixpkgs" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1761106450, - "narHash": "sha256-vneqm8FGC68+bMerG9N772cpJio+ZkVxlqdRhaf1XqE=", - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "rev": "479868718e7396a2e5a552e8e766ec4333f3377b", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "type": "github" - } - }, "devenv": { "inputs": { "cachix": "cachix", @@ -100,11 +73,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761091275, - "narHash": "sha256-SIiugXvSuI2WFedt1NyDj8yHsSDntsO/JWKyEZ+mI50=", + "lastModified": 1761343822, + "narHash": "sha256-ZOykrkxsY2lM4a3+MLZN8eUc0dRXypo3aKvj8v5xN/0=", "owner": "cachix", "repo": "devenv", - "rev": "a795c32dc826b51d12706f27fb344f966bb2b084", + "rev": "679d2951cee2d09da3c732d00b320ce752d21ee0", "type": "github" }, "original": { @@ -421,24 +394,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, - "flake-utils_4": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -453,9 +408,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -471,9 +426,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -716,11 +671,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761055346, - "narHash": "sha256-uFs+nbH5eoPcxjcZKE0fINbj7b0o5vRMHc2cFjR9t7w=", + "lastModified": 1761141169, + "narHash": "sha256-5IZjbTvP5dNTD8CbEYlNbicdGcbCN9SC9ksMm2ZEXH0=", "owner": "helix-editor", "repo": "helix", - "rev": "668bf3878bc5257a9cad0d2edf82610cebf8bcae", + "rev": "d79cce4e4bfc24dd204f1b294c899ed73f7e9453", "type": "github" }, "original": { @@ -729,26 +684,6 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761081701, - "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "homix": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -790,11 +725,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1760515095, - "narHash": "sha256-6MD0hkLbVjH8ncegL1cBLUmw9cwIJJBBXVBr8i4j3Ps=", + "lastModified": 1761259732, + "narHash": "sha256-YI7xGgh+nCoh1k6NJQkXwjDr5B2VQnfZB8/nVCRO7dY=", "owner": "kmonad", "repo": "kmonad", - "rev": "646b05994b9f0f62cd9458d8356fdae5061951ea", + "rev": "7f8a0b38d4777fbacf3629b6ff8805e8eeec2f19", "type": "github" }, "original": { @@ -829,7 +764,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { @@ -848,7 +783,7 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_6", "spectrum": "spectrum" }, @@ -971,11 +906,11 @@ ] }, "locked": { - "lastModified": 1760721282, - "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=", + "lastModified": 1761339987, + "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168", + "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", "type": "github" }, "original": { @@ -990,11 +925,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1761082499, - "narHash": "sha256-yYi9Y1BlbTCz/L91STqZZ9FFMDaW6FJ/tZg+GImssA8=", + "lastModified": 1761356901, + "narHash": "sha256-YDySchURSJrS1P8zuzmFqypUS7shY6//0e0JiMZeLSI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a757514dffbeafcce1a3edb9e83b9f8ae38b10e1", + "rev": "a8635e459ff96acbd156a8de613b99d9d6b3676a", "type": "github" }, "original": { @@ -1035,7 +970,7 @@ }, "nixos-cn": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -1139,7 +1074,7 @@ }, "nixos-rk3588": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixos-generators": "nixos-generators_2", "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks" @@ -1212,11 +1147,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1760968520, - "narHash": "sha256-EjGslHDzCBKOVr+dnDB1CAD7wiQSHfUt3suOpFj9O1Q=", + "lastModified": 1761214245, + "narHash": "sha256-PP9OPFAgQuoeYLnekbROBtaysdnnXAOwdMRn0NJslxY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e755547441a0413942a37692f7bf7fc6315bb7f6", + "rev": "95ec937f47c15392185aafd64480dc128f8a80bd", "type": "github" }, "original": { @@ -1289,27 +1224,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760862643, - "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1760862643, - "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -1324,11 +1243,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1760970213, - "narHash": "sha256-ORO3jMAfjCD/FTYIPrMk8dAP+GMWvFPWae7XanUD1aw=", + "lastModified": 1761229432, + "narHash": "sha256-6TOd2i7Exq47NxjRcx9bizwMDYdxyhU15PjeTzerczA=", "owner": "numtide", "repo": "nixpkgs-unfree", - "rev": "ee5500622743b92fa7b88be334674db1512d872f", + "rev": "80a92b4e4cc50ca26645269daa5f78b3fad995c4", "type": "github" }, "original": { @@ -1347,11 +1266,11 @@ ] }, "locked": { - "lastModified": 1761052311, - "narHash": "sha256-PfWbhEv9d5SsSVWgZIQYJ8IjjkL27ZgoLKDyTXBLzAs=", + "lastModified": 1761397316, + "narHash": "sha256-HGIm1W/Z5foN0g8c2PderNKMb4t5OCCsQteMS2WHf/I=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ecf06e1acb8d5f00d1e23f10777a674e0c6d5579", + "rev": "8d12d9b353a98e7d5bcddf09db42a350fb2bfb8c", "type": "github" }, "original": { @@ -1362,11 +1281,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -1378,11 +1297,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -1392,11 +1311,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -1540,11 +1459,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1761114294, - "narHash": "sha256-WF2vIfHTFaD5MqFuZzwrufTwIOOYo9GJn+91rgrxGFI=", + "lastModified": 1761400656, + "narHash": "sha256-RU9aNWVM233G5ViVQvGdwjKW48ne9Sf/kVl+bpUSwgI=", "owner": "nix-community", "repo": "NUR", - "rev": "5d84bb7cf94f54ebbfde2f30fe465a847a355ea3", + "rev": "7229d59faeaa6f005719c742068ce12ffdaa5ee6", "type": "github" }, "original": { @@ -1560,11 +1479,11 @@ ] }, "locked": { - "lastModified": 1761099030, - "narHash": "sha256-QmYEbR/92/3fjdMhjxSk7C/q+ahDTKmjTHHrhkFfMfs=", + "lastModified": 1761372460, + "narHash": "sha256-oj7hNwh3t3qFxB60+cbRx8N4kIIoZhVbWp2UFPIKC3U=", "owner": "openai", "repo": "codex", - "rev": "53cadb4df6e078354663f435f5fff16bd6fb7aa3", + "rev": "88abbf58cec9843a7cebe250d71146314ebbcf1a", "type": "github" }, "original": { @@ -1671,13 +1590,12 @@ }, "root": { "inputs": { - "dankMaterialShell": "dankMaterialShell", "devenv": "devenv", "dgop": "dgop", "disko": "disko", "dms-cli": "dms-cli", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "gemini-cli": "gemini-cli", "git-hooks": "git-hooks_2", "helix": "helix", @@ -1830,21 +1748,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "waybar": { "inputs": { "flake-compat": "flake-compat_7", @@ -1853,11 +1756,11 @@ ] }, "locked": { - "lastModified": 1760873938, - "narHash": "sha256-oKmQUUqprJNFZfSNFtYu9pOmLXMkP7M51kF1lX8WPp4=", + "lastModified": 1761204979, + "narHash": "sha256-QWS3FCd6sTbr1runpZPdpVrhqFu8E5fNOpfp0r9ifLk=", "owner": "alexays", "repo": "waybar", - "rev": "84ec25bbebef8a9ce0720675214a078808e73c39", + "rev": "161367d9617673a4ef9caf8299411dc5153464d1", "type": "github" }, "original": { @@ -1955,11 +1858,11 @@ ] }, "locked": { - "lastModified": 1761105987, - "narHash": "sha256-d01CGcdNlsqIn4ncGCWHM0Velnii/Ggef1iybQvEOfc=", + "lastModified": 1761278750, + "narHash": "sha256-H00vsbCQRRutJ6sg7Pijy+pPY0+mafnTWw1MZXdVbh8=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "e7d9fefd8665be5d4c77466140f21a15f6d29e93", + "rev": "1689281237cb389759a005c41545302a54ec8100", "type": "github" }, "original": { diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix index a57ab1e..1532013 100644 --- a/hosts/local/gui.nix +++ b/hosts/local/gui.nix @@ -57,4 +57,24 @@ xorg.xhost gparted ]; + + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-mozc + # mozc-ut is better, wat do + fcitx5-gtk + libsForQt5.fcitx5-qt + fcitx5-lua + fcitx5-configtool + fcitx5-rime + ]; + }; + environment.variables = { + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; + FCITX_SOCKET = "default"; + }; } diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix index d49a9d6..da9d503 100644 --- a/hosts/local/i3.nix +++ b/hosts/local/i3.nix @@ -52,7 +52,8 @@ in { vSync = true; }; environment.systemPackages = with pkgs; [ - old-pkgs.vivaldi + # old-pkgs.vivaldi + vivaldi #notifications dunst polybar diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix index cad65c8..bf905e8 100644 --- a/hosts/local/master/configuration.nix +++ b/hosts/local/master/configuration.nix @@ -11,10 +11,10 @@ in { # Include the results of the hardware scan. ../../base.nix ../../linux.nix - ../../unfree.nix + # ../../unfree.nix #../../android.nix - ../gui.nix - ../i3.nix + # ../gui.nix + # ../i3.nix # ../gnome.nix # ../wayland.nix ../nvidia.nix diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix index 6cdcd98..5e2e241 100644 --- a/hosts/local/master/keyboard.nix +++ b/hosts/local/master/keyboard.nix @@ -5,25 +5,6 @@ }; # config file keeps getting rewritten but I don't know by who - i18n.inputMethod = { - enable = true; - type = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - # mozc-ut is better, wat do - fcitx5-gtk - libsForQt5.fcitx5-qt - fcitx5-lua - fcitx5-configtool - fcitx5-rime - ]; - }; - environment.variables = { - GTK_IM_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - FCITX_SOCKET = "default"; - }; #kmonad services.kmonad = { diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix index b8b335a..b17c708 100644 --- a/hosts/local/nvidia.nix +++ b/hosts/local/nvidia.nix @@ -12,7 +12,14 @@ else config.boot.kernelPackages.nvidiaPackages.beta; in { boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; - environment.systemPackages = [pkgs.nvitop]; + environment.systemPackages = [ + pkgs.nvitop + ]; + + nixpkgs.config = { + allowUnfree = true; + }; + # boot.kernelPackages = lib.mkForce unfreePkgs.linuxKernel.packages.linux_xanmod_latest; # boot.kernelParams = ["video=HDMI-A-1:1920x1080"]; # @@ -66,6 +73,9 @@ in { # nvidiaSettings = true; open = false; }; + hardware.nvidia-container-toolkit = { + enable = true; + }; # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver { # version = "525.116.04"; # sha256_64bit = "sha256-hhDsgkR8/3LLXxizZX7ppjSlFRZiuK2QHrgfTE+2F/4="; diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix index 0100e4f..17a90b9 100644 --- a/hosts/pkgs.nix +++ b/hosts/pkgs.nix @@ -55,10 +55,10 @@ #nixfmt direnv nix-direnv - cachix devenv - devbox # inputs.devenv.packages.${pkgs.system}.default + cachix + devbox bun # scraping python312Packages.yt-dlp |