From 7b381ca3d8a7908c845cbb2aacd467c3d98bee07 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Mon, 31 Mar 2025 14:39:02 +0200 Subject: [PATCH] update --- flake.lock | 165 ++++++++++-------------------- flake.nix | 16 ++- home-manager/firefox/default.nix | 10 +- home-manager/hyprland/default.nix | 2 +- home-manager/mpv.nix | 2 +- home-manager/zsh/default.nix | 1 + modules/graphical/audio.nix | 2 +- modules/graphical/games.nix | 2 +- modules/hardware/amd-gpu.nix | 6 +- systems/pc/configuration.nix | 4 +- 10 files changed, 77 insertions(+), 133 deletions(-) diff --git a/flake.lock b/flake.lock index 3110c87..86e077c 100644 --- a/flake.lock +++ b/flake.lock @@ -216,22 +216,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -247,7 +231,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -270,11 +254,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -493,11 +477,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1743387206, + "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "type": "github" }, "original": { @@ -514,11 +498,11 @@ ] }, "locked": { - "lastModified": 1741955947, - "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", + "lastModified": 1743360001, + "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", + "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "type": "github" }, "original": { @@ -604,11 +588,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1742746774, - "narHash": "sha256-p33LUt9KoNQOAFBWOyN8OfWLVKUOyAyX8PLwWw6s454=", + "lastModified": 1743370710, + "narHash": "sha256-caSjWT8knTS9rtxxIBBUk8srdi+XlbPC82qFrC6Wp5s=", "ref": "refs/heads/main", - "rev": "e4abf26069b4d43c8f6ad6b3dfb56c952abb38c2", - "revCount": 5924, + "rev": "79b526a04199a05d1e9b0bbb035ba20b652a7a2b", + "revCount": 5952, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -853,28 +837,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1741919923, - "narHash": "sha256-ZBKD3Rd8fCu8TaGr2bkHqai3bqxKuUBOFLLMWThcGKM=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "24785e84d4b3844936caffe2c56994bdef9a9300", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-generators": { "inputs": { "nixlib": "nixlib", @@ -883,11 +845,11 @@ ] }, "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -898,11 +860,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -914,17 +876,17 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1741870048, - "narHash": "sha256-odXRdNZGdXg1LmwlAeWL85kgy/FVHsgKlDwrvbR2BsU=", + "lastModified": 1743125458, + "narHash": "sha256-0z+5AMacL2Eqo92fAd0eCWeKVecWrxPJwd5/BIfcdJ8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5d76001e33ee19644a598ad80e7318ab0957b122", + "rev": "394c77f61ac76399290bfc2ef9d47b1fba31b215", "type": "github" }, "original": { @@ -935,11 +897,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { @@ -951,11 +913,11 @@ }, "nixpkgs-gimp3": { "locked": { - "lastModified": 1735507908, - "narHash": "sha256-VA+khC0S0di6w5Yv1kBNRpAihnt2prT/ehQzsKMhEoA=", + "lastModified": 1743382397, + "narHash": "sha256-BySzSNxhxO2rWw7j27OhO+VaD2gKDqt69hb6tZm0q2g=", "owner": "jtojnar", "repo": "nixpkgs", - "rev": "771cf18187fefcfaababd35834917c621447fee8", + "rev": "7c249405cd7f26cb43882685955b75b8b1eb8498", "type": "github" }, "original": { @@ -996,29 +958,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1741724370, - "narHash": "sha256-WsD+8uodhl58jzKKcPH4jH9dLTLFWZpVmGq4W1XDVF4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "95600680c021743fd87b3e2fe13be7c290e1cac4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -1030,11 +976,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", "type": "github" }, "original": { @@ -1046,11 +992,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -1067,11 +1013,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741709061, - "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", + "lastModified": 1743362786, + "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", + "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "type": "github" }, "original": { @@ -1087,11 +1033,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741964028, - "narHash": "sha256-Fh4zKt0kn2kZ63bkCQ4c9suDbz4pYcsFP/5J5pJJKa8=", + "lastModified": 1743416833, + "narHash": "sha256-JBz6KWbF4MFgQVpwrq7FaUsPxDN/wQEbUAUHmm1Q494=", "owner": "nix-community", "repo": "NUR", - "rev": "fc4860b6b689a8b96faafb157d390f26878590be", + "rev": "a3f52fa7fae676916064a4b32cf306f15a79b408", "type": "github" }, "original": { @@ -1133,11 +1079,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -1156,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1742058297, - "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1178,7 +1124,6 @@ "home-manager-unstable": "home-manager-unstable", "hyprland": "hyprland", "nix-colors": "nix-colors", - "nixos-cosmic": "nixos-cosmic", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", @@ -1198,7 +1143,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -1217,11 +1162,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741960086, - "narHash": "sha256-8S32m8oU2xZGXevtkS//vMKVY1JLHWUQVPIROl4eo6Q=", + "lastModified": 1743347063, + "narHash": "sha256-2wCoQhyHo3lIRkm/Y4d2ViknCQHhoS2qGvjm//Noo90=", "owner": "danth", "repo": "stylix", - "rev": "6a2e5258876c46b62edacb3e51a759ed1c06332b", + "rev": "eede71351571c60b87dbf9eefb7ddf2b11fb1354", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d25ef6c..4f1378b 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,6 @@ }; nix-colors.url = "github:misterio77/nix-colors"; ## unstable - #TODO: wait until https://github.com/NixOS/nixpkgs/pull/339641 is in unstable https://nixpk.gs/pr-tracker.html?pr=339641 - #nixpkgs-unstable.url = "github:nixos/nixpkgs/a6916c76a7d202e3c02134e620f6477b8600ce9d"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-gimp3.url = "github:jtojnar/nixpkgs/gimp-meson"; nixpkgs-mesa-git.url = "github:kropatz/nixpkgs/mesa-git"; @@ -37,10 +35,10 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; # cosmic testing - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; + #nixos-cosmic = { + # url = "github:lilyinstarlight/nixos-cosmic"; + # inputs.nixpkgs.follows = "nixpkgs-unstable"; + #}; # vim configuration with nix nixvim = { url = "github:nix-community/nixvim"; @@ -74,7 +72,7 @@ , home-manager , home-manager-unstable , nix-colors - , nixos-cosmic + #, nixos-cosmic , nixvim , nixos-generators , stylix @@ -119,8 +117,8 @@ ./modules/graphical stylix.nixosModules.stylix ./modules/graphical/stylix.nix - nixos-cosmic.nixosModules.default - ./modules/graphical/cosmic.nix + #nixos-cosmic.nixosModules.default + #./modules/graphical/cosmic.nix ({ outputs, ... }: { stylix.image = ./tsukasa.jpg; }) ]; specialArgs = specialArgs // { inherit inputs outputs; }; diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix index 58e2f7c..f06cf45 100644 --- a/home-manager/firefox/default.nix +++ b/home-manager/firefox/default.nix @@ -2,15 +2,15 @@ let merge = lib.foldr (a: b: a // b) { }; search = { - default = "DuckDuckGo"; + default = "ddg"; force = true; engines = { # don't need these default ones - "Amazon.com".metaData.hidden = true; - "Bing".metaData.hidden = true; - "eBay".metaData.hidden = true; + "amazondotcom-us".metaData.hidden = true; + "bing".metaData.hidden = true; + "ebay".metaData.hidden = true; - "DuckDuckGo" = { + "ddg" = { urls = [{ template = "https://duckduckgo.com"; params = [{ diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix index 377df45..25eb411 100644 --- a/home-manager/hyprland/default.nix +++ b/home-manager/hyprland/default.nix @@ -1,7 +1,7 @@ { imports = [ ./hyprland-settings.nix - ./hyprspace.nix + #./hyprspace.nix #./hyprland-xwaylandvideobridge.nix not needed anymore ./waybar.nix ./hyprlock.nix diff --git a/home-manager/mpv.nix b/home-manager/mpv.nix index 837327e..e3af0ad 100644 --- a/home-manager/mpv.nix +++ b/home-manager/mpv.nix @@ -8,7 +8,7 @@ scripts = with pkgs.mpvScripts; [ mpris videoclip # keybind = c - modernx + #modernx ]; }; } diff --git a/home-manager/zsh/default.nix b/home-manager/zsh/default.nix index d4544cd..e535891 100644 --- a/home-manager/zsh/default.nix +++ b/home-manager/zsh/default.nix @@ -38,6 +38,7 @@ "echo schedutil | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor"; cpu_freq = ''watch -n 1 "cat /proc/cpuinfo | grep \"^[c]pu MHz\""''; gpu_monitor = "nvidia-smi dmon -s puct"; + nix-shell = "nix-shell --command zsh"; }; #plugins = with pkgs; [ # { diff --git a/modules/graphical/audio.nix b/modules/graphical/audio.nix index 861fcfa..ef95525 100644 --- a/modules/graphical/audio.nix +++ b/modules/graphical/audio.nix @@ -18,7 +18,7 @@ in alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - jack.enable = true; + #jack.enable = true; }; }; } diff --git a/modules/graphical/games.nix b/modules/graphical/games.nix index c04f95e..0a4254f 100644 --- a/modules/graphical/games.nix +++ b/modules/graphical/games.nix @@ -52,7 +52,7 @@ in steamtinkerlaunch tetrio-desktop #libs - ]) ++ optionals cfg.enableVr (with pkgs; [ beatsabermodmanager ]); + ]) ++ optionals cfg.enableVr (with pkgs; [ bs-manager ]); }; } diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix index d25487f..1bd9152 100644 --- a/modules/hardware/amd-gpu.nix +++ b/modules/hardware/amd-gpu.nix @@ -10,10 +10,10 @@ in { mesa-new = pkgs.mesa-git.mesa.overrideAttrs (oldAttrs: { src = pkgs.fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "hakzsam"; + owner = "mesa"; repo = "mesa"; - rev = "e76537447570f64b138d6338ca59117da18c113c"; - hash = "sha256-k618hjo0H0O3FtAJp3YT8+cfFvMXI+wCmbv9lxDhrIc="; + rev = "aa8fec638f5e2731e88b9463c67aac7c34bae800"; + hash = "sha256-j/v5Z8EBgoOuMOXUXxqRQMqBmHMpR5I/Qz7wgcXE7Vk="; }; }); in diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 12e7082..af12f49 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -20,7 +20,7 @@ ]; custom = { - #tmpfs.enable = true; + tmpfs.enable = true; wireshark.enable = true; virt-manager.enable = true; nftables.enable = true; @@ -202,7 +202,7 @@ services.xserver.enable = true; # Configure console keymap - console.keyMap = "de"; + console.keyMap = "en"; # Enable CUPS to print documents. # disable until CVE-2024-47176, CVE-2024-47076, CVE-2024-47175, and CVE-2024-47177 is fixed