diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | flake.lock | 245 | ||||
| -rw-r--r-- | home/editors/nixvim.nix | 26 | ||||
| -rw-r--r-- | home/home.nix | 4 | ||||
| -rw-r--r-- | home/programs/nixcord.nix | 5 | ||||
| -rw-r--r-- | home/terminal/fish.nix | 2 | ||||
| -rw-r--r-- | home/wayland/niri/binds.nix | 6 | ||||
| -rw-r--r-- | home/xdg.nix | 10 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 14 | ||||
| -rw-r--r-- | modules/boot.nix | 5 | ||||
| -rw-r--r-- | modules/ollama.nix | 4 |
11 files changed, 123 insertions, 200 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f6ac161..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -home/private.nix -result @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1764370710, - "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", + "lastModified": 1764714051, + "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", + "rev": "a43bedcceced5c21ad36578ed823e6099af78214", "type": "github" }, "original": { @@ -42,11 +42,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764379284, - "narHash": "sha256-nNdyU94gWdwMphROshWPueeUi/s7Yq463WZl4/yk0Tk=", + "lastModified": 1764956616, + "narHash": "sha256-jTGdwLtST22pUZqlRvOMAwSBxpj4bxKpIfThpmBX3Pw=", "ref": "refs/heads/main", - "rev": "0b1bb7fe02bc0668c71b969452ea852e2f25e0fa", - "revCount": 1319, + "rev": "526dd85c8047fb700dd7715701e4ca1e553275a0", + "revCount": 1321, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -64,11 +64,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1764720660, - "narHash": "sha256-zrU6DwLb5zXCg6JxfVJyNCJex0LjuTUXchotq44Vn+w=", + "lastModified": 1764847736, + "narHash": "sha256-FMYnfCH2TMNnTJvbc/mraZpRszIL7nc5YI6w/pWNyNs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1739cb8049b3184496279dc6a272b56d466ddd58", + "rev": "e3f8349d60d5daf58951b9ccd089fecb79ea5443", "type": "github" }, "original": { @@ -237,25 +237,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" - }, - "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_2": { - "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -301,11 +283,11 @@ ] }, "locked": { - "lastModified": 1764636297, - "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", + "lastModified": 1764788330, + "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", + "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", "type": "github" }, "original": { @@ -321,11 +303,11 @@ ] }, "locked": { - "lastModified": 1764780230, - "narHash": "sha256-/hLZoLxzr2jwMStuUofB6PZm2eE3kpw91WObm66vPUs=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "af324afa72de6d23162f0cdcb0716afe6e626683", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -403,6 +385,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -411,11 +394,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764777705, - "narHash": "sha256-YhvU84Z4sOGEfEsVv0Zh1c4bQIpiL6C5Vk7xD+GV7S8=", + "lastModified": 1765024946, + "narHash": "sha256-GkPsL9anbbrmtWMP/O7W2+0WuktiK+4hOx5ziM+DQ3Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "93e5e92b0ae7809ee0f64d94d51e210c476ee823", + "rev": "f8d5aad1a1f61e1b6443c27394a38c8c54d39e9e", "type": "github" }, "original": { @@ -457,11 +440,11 @@ ] }, "locked": { - "lastModified": 1764616927, - "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", + "lastModified": 1764812575, + "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", + "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", "type": "github" }, "original": { @@ -588,11 +571,11 @@ ] }, "locked": { - "lastModified": 1764637132, - "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", + "lastModified": 1764962281, + "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "2f2413801beee37303913fc3c964bbe92252a963", + "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "type": "github" }, "original": { @@ -626,31 +609,32 @@ "type": "github" } }, - "ixx": { + "hyprwire": { "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" + "hyprutils": [ + "hyprland", + "hyprutils" ], "nixpkgs": [ - "nixvim", - "nuschtosSearch", + "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", + "lastModified": 1764872015, + "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", "type": "github" }, "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", + "owner": "hyprwm", + "repo": "hyprwire", "type": "github" } }, @@ -663,11 +647,11 @@ ] }, "locked": { - "lastModified": 1764655750, - "narHash": "sha256-tBrcUSu/47u+E+81SUVUpXrqhkcM3Xqg/4taWFI/99k=", + "lastModified": 1764746434, + "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1127a4fc66425cceae683becb93f038819cf2633", + "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", "type": "github" }, "original": { @@ -701,11 +685,11 @@ ] }, "locked": { - "lastModified": 1764720343, - "narHash": "sha256-avGXIgpKIuQpwXVWLp8ZAP/pQx4ByLDKh6HTXiB6VXg=", + "lastModified": 1764979571, + "narHash": "sha256-xOGEM8dZ6WtOnf+fkTthtiUbE47ZCEvuZTVsOrdTEZU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9679463fe603c9cc7aa487dc7e1efaf0af5f342f", + "rev": "a70eaf7ca72ae845d53e2b2aa6106eebb00a4ed0", "type": "github" }, "original": { @@ -717,11 +701,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1764719067, - "narHash": "sha256-/C8yHYHrQwVNn7BUMCC/4kFC+incmwwQV/pnZf/QdHw=", + "lastModified": 1764968664, + "narHash": "sha256-aueNP7DLGEqX+eUlkMz0X7h0X3c4IxLLxhMBG7MTPpg=", "owner": "neovim", "repo": "neovim", - "rev": "a702534c501f413b7d81461fbb141ff3bbc1c2d7", + "rev": "d6bee7e407442112ee9008ea35d6fe73dbb3eaaf", "type": "github" }, "original": { @@ -742,11 +726,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764721873, - "narHash": "sha256-EHMH54iI7MYYb7mUBE6JUtbbVhHTF7jtkuZ0Lo1bkBg=", + "lastModified": 1765008770, + "narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3935696628433007c582fc323730ba18f137a1d", + "rev": "935080f54490e3e7b1eda731cbe1478744546ea8", "type": "github" }, "original": { @@ -775,11 +759,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764678181, - "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", + "lastModified": 1764966114, + "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "owner": "YaLTeR", "repo": "niri", - "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", + "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "type": "github" }, "original": { @@ -820,11 +804,11 @@ ] }, "locked": { - "lastModified": 1764749082, - "narHash": "sha256-aFNYaqN5TyOaIGTRVID2hD/etBxfrAXAzj6ioPE0bmE=", + "lastModified": 1764980756, + "narHash": "sha256-tPbSzm3iuU+mdZC1gjRqCXYavD59TyEDBMq3MLMbRZQ=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "54bd4d867e993339a4486e1d04e8a4b22a88773e", + "rev": "704c555cb2d46a715ca8493243c514ba19986e5b", "type": "github" }, "original": { @@ -835,11 +819,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -866,27 +850,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1764836381, + "narHash": "sha256-8jemYbbW9EBttQKHep7Rj8kzXaxsrk/lACdXA2DN5Xk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "ff06bd3398fb1bea6c937039ece7e7c8aa396ebf", "type": "github" }, "original": { @@ -898,11 +882,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -934,15 +918,14 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1764764672, - "narHash": "sha256-BZN3w7AYQlXLKBK/FXu8K/tVTXxVsk/pAwEl6aAyxhE=", + "lastModified": 1765025132, + "narHash": "sha256-USUncEehfJMi6MQAJF92Lu8WDJ4FFj25uSEXCtIL6G4=", "owner": "nix-community", "repo": "nixvim", - "rev": "8c9ba3b5d85cb985ab7372abf11af1954df15e4a", + "rev": "b502802572ea81ebf16090f97f27219f7057a7b0", "type": "github" }, "original": { @@ -958,11 +941,11 @@ ] }, "locked": { - "lastModified": 1764786887, - "narHash": "sha256-wfXBldHtlqv+e2ClUKdKPmDJ/SZWHZlhgzNPRik6ZWY=", + "lastModified": 1765023848, + "narHash": "sha256-tmR9oI50ESiX8rm3k1O0h6kXOypgp57AYcO/Ybeg51Y=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6f2bc805afbf040bfb4d08b2e5c7aea374d44414", + "rev": "ff04d643315d92bfab9dc81837bc17949e06370f", "type": "github" }, "original": { @@ -971,29 +954,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1004,11 +964,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -1025,11 +985,11 @@ ] }, "locked": { - "lastModified": 1764657912, - "narHash": "sha256-cO7ZaRfnSHptnmjaff5yiSUKO0fEhgIuMA4ZEVmiuE0=", + "lastModified": 1764848692, + "narHash": "sha256-rPnPUOiG/Cg9sS7JWY5RKyZaN3g5ZoeLoJ1jx13POaI=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "fbe239eb3d8e4f7cb437cb7f6772b9953efaeec3", + "rev": "92738feebae6e25bd2c06985516f66cc19eae01d", "type": "github" }, "original": { @@ -1088,11 +1048,11 @@ ] }, "locked": { - "lastModified": 1764643237, - "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=", + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "type": "github" }, "original": { @@ -1166,7 +1126,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1764698597, @@ -1242,21 +1202,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_4", @@ -1354,18 +1299,18 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1764752802, - "narHash": "sha256-cjw3krBZlN/zY+fZbSKmROuvfwkQLxaZcjdhXzDTX88=", + "lastModified": 1764949583, + "narHash": "sha256-pB+q3HIyIA3k1AnDiU9MDfJ5xNso1XX95qV0F5oe3cM=", "owner": "sxyazi", "repo": "yazi", - "rev": "c6e03e91d2d3cd45b4728d864e37fb89e5dd526d", + "rev": "c569263a5084f627ae70f983c271464b42890426", "type": "github" }, "original": { diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix index 6bfc119..2ea5b94 100644 --- a/home/editors/nixvim.nix +++ b/home/editors/nixvim.nix @@ -91,31 +91,5 @@ register = "wl-copy"; }; }; - - # keymaps = [ - # { - # key = "<Up>"; - # action = "<Nop>"; - # mode = [ "n" "i" "v" ]; - # options = { silent = true; }; - # } - # { key = "<Down>"; - # action = "<Nop>"; - # mode = [ "n" "i" "v" ]; - # options = { silent = true; }; - # } - # { - # key = "<Left>"; - # action = "<Nop>"; - # mode = [ "n" "i" "v" ]; - # options = { silent = true; }; - # } - # { - # key = "<Right>"; - # action = "<Nop>"; - # mode = [ "n" "i" "v" ]; - # options = { silent = true; }; - # } - # ]; }; } diff --git a/home/home.nix b/home/home.nix index f606bd5..121b61c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -9,7 +9,7 @@ ./wayland/noctalia.nix # Editors ./editors/nixvim.nix - ./editors/helix.nix + # ./editors/helix.nix # Programs ./terminal/foot.nix ./terminal/fish.nix @@ -29,8 +29,8 @@ home.stateVersion = "25.05"; home.packages = with pkgs; [ + bottles ncdu - halloy equibop inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix index ddd648a..d7978af 100644 --- a/home/programs/nixcord.nix +++ b/home/programs/nixcord.nix @@ -1,8 +1,9 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ inputs.nixcord.homeModules.nixcord ]; programs.nixcord = { enable = true; + package = pkgs.discord-krisp; discord = { enable = true; vencord.enable = false; @@ -50,7 +51,7 @@ customTimestamps.enable = true; disableCallIdle.enable = true; disableDeepLinks.enable = true; - dontFilterMe.enable = true; + # dontFilterMe.enable = true; dontRoundMyTimestamps.enable = true; equicordHelper = { enable = true; diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix index f1ad64d..ec75de8 100644 --- a/home/terminal/fish.nix +++ b/home/terminal/fish.nix @@ -22,8 +22,6 @@ ff = "fastfetch"; cat = "bat"; ls = "eza"; - find = "fd"; - grep = "rg"; }; plugins = [ diff --git a/home/wayland/niri/binds.nix b/home/wayland/niri/binds.nix index aea36e7..53d2d4e 100644 --- a/home/wayland/niri/binds.nix +++ b/home/wayland/niri/binds.nix @@ -42,17 +42,17 @@ # Screenshot (selection -> copy + save) "Mod+S".action = spawn "sh" "-c" '' - filename="/media/ss/$(date +%Y-%m-%d_%H-%M-%S).png" + filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png" grim -g "$(slurp)" - | tee "$filename" | wl-copy ''; # Screenshot (selection -> save -> edit with satty -> copy edited) "Mod+Shift+S".action = spawn "sh" "-c" '' - filename="/media/ss/$(date +%Y-%m-%d_%H-%M-%S).png" + filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png" grim -g "$(slurp)" "$filename" - edited="/media/ss/$(date +%Y-%m-%d_%H-%M-%S)-edited.png" + edited="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)-edited.png" satty --filename "$filename" --output-filename "$edited" ''; diff --git a/home/xdg.nix b/home/xdg.nix index a587d04..07b78f1 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -18,9 +18,8 @@ XDG_PROJECTS_DIR = "$HOME/proj"; XDG_GAMES_DIR = "$HOME/games"; XDG_MEDIA_DIR = "/media"; - XDG_SS_DIR = "/media/ss"; - XDG_CLIPS_DIR = "/media/clips"; - XDG_ISO_DIR = "/media/iso"; + XDG_SS_DIR = "/media/pics/ss"; + XDG_CLIPS_DIR = "/media/vids/clips"; XDG_ARCHIVE_DIR = "/media/archive"; }; }; @@ -28,9 +27,8 @@ XDG_PROJECTS_DIR = "$HOME/proj"; XDG_GAMES_DIR = "$HOME/games"; XDG_MEDIA_DIR = "/media"; - XDG_SS_DIR = "/media/ss"; - XDG_CLIPS_DIR = "/media/clips"; - XDG_ISO_DIR = "/media/iso"; + XDG_SS_DIR = "/media/pics/ss"; + XDG_CLIPS_DIR = "/media/vids/clips"; XDG_ARCHIVE_DIR = "/media/archive"; }; } diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 9520908..3de13e7 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -62,7 +62,6 @@ programs.steam = { localNetworkGameTransfers.openFirewall = true; dedicatedServer.openFirewall = true; remotePlay.openFirewall = false; - gamescopeSession.enable = true; extest.enable = true; protontricks.enable = true; @@ -108,7 +107,12 @@ chaotic = { }; }; -xdg.portal.enable = true; + xdg.portal = { + enable = true; + # extraPortals = with pkgs; [ + # xdg-desktop-portal-gtk # For a fallback file chooser + # ]; + }; time.timeZone = "Europe/Warsaw"; @@ -153,13 +157,17 @@ environment.sessionVariables = { }; environment.systemPackages = with pkgs; [ + vkd3d + dxvk + nautilus gnome-keyring kdePackages.dolphin swaylock-effects swayidle helvum fuzzel - wineWowPackages.waylandFull +# wineWowPackages.waylandFull + wineWowPackages.unstableFull winetricks tuigreet linux-firmware diff --git a/modules/boot.nix b/modules/boot.nix index 0054804..aba7a41 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -14,11 +14,12 @@ supportedFilesystems = [ "ntfs" ]; initrd.kernelModules = [ "amdgpu" "kvm-amd" ]; kernelParams = [ - "video=DP-1:2560x1440@240" + # "video=DP-1:2560x1440@240" "quiet" ]; + kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4; # kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { mArch = "ZEN4"; }; - kernelPackages = pkgs.linuxPackages_zen; + # kernelPackages = pkgs.linuxPackages_zen; # kernelPackages = pkgs.linuxPackages_6_12; }; } diff --git a/modules/ollama.nix b/modules/ollama.nix index 50b9471..be032c2 100644 --- a/modules/ollama.nix +++ b/modules/ollama.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { fileSystems."/models" = { device = "/home/ollama"; @@ -8,7 +8,7 @@ services.ollama = { enable = true; - acceleration = "rocm"; + package = pkgs.ollama-rocm; loadModels = [ "deepseek-r1:14b" "qwen3:14b" |