diff options
| -rw-r--r-- | flake.lock | 132 | ||||
| -rw-r--r-- | home/git.nix | 11 | ||||
| -rw-r--r-- | home/home.nix | 30 | ||||
| -rw-r--r-- | home/shells/fish.nix | 17 | ||||
| -rw-r--r-- | home/shells/starship.nix | 10 | ||||
| -rw-r--r-- | home/terminal/btop.nix | 6 | ||||
| -rw-r--r-- | home/terminal/fish.nix | 64 | ||||
| -rw-r--r-- | home/terminal/foot.nix (renamed from home/terminals/foot.nix) | 0 | ||||
| -rw-r--r-- | home/terminal/starship.nix | 111 | ||||
| -rw-r--r-- | home/terminal/utils.nix | 26 | ||||
| -rw-r--r-- | home/wayland/niri/niri.nix | 1 | ||||
| -rw-r--r-- | home/xdg.nix | 4 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 34 | ||||
| -rw-r--r-- | modules/boot.nix | 3 | ||||
| -rw-r--r-- | modules/ollama.nix | 14 |
15 files changed, 316 insertions, 147 deletions
@@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1763922789, - "narHash": "sha256-XnkWjCpeXfip9tqYdL0b0zzBDjq+dgdISvEdSVGdVyA=", + "lastModified": 1764370710, + "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a20a0e67a33b6848378a91b871b89588d3a12573", + "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1764596563, - "narHash": "sha256-tH3AGDWlAN3ImVuBBCLmqaqD0EbkISiPCHGeMcd430k=", + "lastModified": 1764720660, + "narHash": "sha256-zrU6DwLb5zXCg6JxfVJyNCJex0LjuTUXchotq44Vn+w=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0701ee838b0fb34a77b6dd4b35476b4bb09fbca9", + "rev": "1739cb8049b3184496279dc6a272b56d466ddd58", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1764194569, - "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", + "lastModified": 1764636297, + "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", + "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1764603455, - "narHash": "sha256-Q70rxlbrxPcTtqWIb9+71rkJESxIOou5isZBvyOieXw=", + "lastModified": 1764780230, + "narHash": "sha256-/hLZoLxzr2jwMStuUofB6PZm2eE3kpw91WObm66vPUs=", "owner": "nix-community", "repo": "home-manager", - "rev": "effe4c007d6243d9e69ce2242d76a2471c1b8d5c", + "rev": "af324afa72de6d23162f0cdcb0716afe6e626683", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764607679, - "narHash": "sha256-1Bsem6lhJWMQmkLIml5oKOL+z1dYMewZ6ql0K35Y3TA=", + "lastModified": 1764777705, + "narHash": "sha256-YhvU84Z4sOGEfEsVv0Zh1c4bQIpiL6C5Vk7xD+GV7S8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f82a8630d7a51dab4cc70924f500bf70e723db12", + "rev": "93e5e92b0ae7809ee0f64d94d51e210c476ee823", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1763727565, - "narHash": "sha256-vRff/2R1U1jzPBy4OODqh2kfUzmizW/nfV2ROzTDIKo=", + "lastModified": 1764616927, + "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "7724d3a12a0453e7aae05f2ef39474219f05a4b4", + "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1763819661, - "narHash": "sha256-0jLarTR/BLWdGlboM86bPVP2zKJNI2jvo3JietnDkOM=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a318deec0c12409ec39c68d2be8096b636dc2a5c", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -563,11 +563,11 @@ ] }, "locked": { - "lastModified": 1763503177, - "narHash": "sha256-VPoiswJBBmTLVuNncvT/8FpFR+sYcAi/LgP/zTZ+5rA=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "f4e1e12755567ecf39090203b8f43eace8279630", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -588,11 +588,11 @@ ] }, "locked": { - "lastModified": 1763996058, - "narHash": "sha256-DsqzFZvrEV+aDmavjaD4/bk5qxeZwhGxPWBQdpFyM9Y=", + "lastModified": 1764637132, + "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0168583075baffa083032ed13a8bea8ea12f281a", + "rev": "2f2413801beee37303913fc3c964bbe92252a963", "type": "github" }, "original": { @@ -663,11 +663,11 @@ ] }, "locked": { - "lastModified": 1764275117, - "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", + "lastModified": 1764655750, + "narHash": "sha256-tBrcUSu/47u+E+81SUVUpXrqhkcM3Xqg/4taWFI/99k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", + "rev": "1127a4fc66425cceae683becb93f038819cf2633", "type": "github" }, "original": { @@ -701,11 +701,11 @@ ] }, "locked": { - "lastModified": 1764547590, - "narHash": "sha256-PDVKI5QCPfzVCPY/ZYAQTHGwC9ksT8ISNVaVZDVzb54=", + "lastModified": 1764720343, + "narHash": "sha256-avGXIgpKIuQpwXVWLp8ZAP/pQx4ByLDKh6HTXiB6VXg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "71ba04d8a26327031fd58284af4a4891d7b3c842", + "rev": "9679463fe603c9cc7aa487dc7e1efaf0af5f342f", "type": "github" }, "original": { @@ -717,11 +717,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1764519732, - "narHash": "sha256-R0UspjBwPi5St0Dxq9Ej9ejJ34K8ivF5WeCS9dMvvVQ=", + "lastModified": 1764719067, + "narHash": "sha256-/C8yHYHrQwVNn7BUMCC/4kFC+incmwwQV/pnZf/QdHw=", "owner": "neovim", "repo": "neovim", - "rev": "d62bbe24cbe5311ce595d73a0c40dc87af989666", + "rev": "a702534c501f413b7d81461fbb141ff3bbc1c2d7", "type": "github" }, "original": { @@ -742,11 +742,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764595404, - "narHash": "sha256-FMKDx+r0c7L1ekkIt2dNYgvXULVfSCDN9zXnAOnArew=", + "lastModified": 1764721873, + "narHash": "sha256-EHMH54iI7MYYb7mUBE6JUtbbVhHTF7jtkuZ0Lo1bkBg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "36483fec897fc0c336b3075b3b2d387edac71c9e", + "rev": "f3935696628433007c582fc323730ba18f137a1d", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764485473, - "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", + "lastModified": 1764678181, + "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", "owner": "YaLTeR", "repo": "niri", - "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", + "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", "type": "github" }, "original": { @@ -820,11 +820,11 @@ ] }, "locked": { - "lastModified": 1764576281, - "narHash": "sha256-f6vfwmIb9C3brI4/KJ9MFUDWt6FsKQ0dbMO6AuFc7E0=", + "lastModified": 1764749082, + "narHash": "sha256-aFNYaqN5TyOaIGTRVID2hD/etBxfrAXAzj6ioPE0bmE=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "c8f47894134a4984acd319e66c4384eb1ff886e2", + "rev": "54bd4d867e993339a4486e1d04e8a4b22a88773e", "type": "github" }, "original": { @@ -938,11 +938,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1764611906, - "narHash": "sha256-8UbK91SY+IN93IsA59G1W0IclCCgJ95DhNxi9b1YLHw=", + "lastModified": 1764764672, + "narHash": "sha256-BZN3w7AYQlXLKBK/FXu8K/tVTXxVsk/pAwEl6aAyxhE=", "owner": "nix-community", "repo": "nixvim", - "rev": "ee6ccaae42fc032ca4678951b48f92c635cb8ebc", + "rev": "8c9ba3b5d85cb985ab7372abf11af1954df15e4a", "type": "github" }, "original": { @@ -958,11 +958,11 @@ ] }, "locked": { - "lastModified": 1764621543, - "narHash": "sha256-cSUgRN2X0CAnAZy2Rm80eDwm+1YUpZUIByFn0t8jqSU=", + "lastModified": 1764786887, + "narHash": "sha256-wfXBldHtlqv+e2ClUKdKPmDJ/SZWHZlhgzNPRik6ZWY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a498c851c31e6ec7eaca7147c10056523c6d7f07", + "rev": "6f2bc805afbf040bfb4d08b2e5c7aea374d44414", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1764619790, - "narHash": "sha256-yzCL5N4HkuTSSwHZYDx9+9vP1zUs1UnTyhq19BTojj8=", + "lastModified": 1764657912, + "narHash": "sha256-cO7ZaRfnSHptnmjaff5yiSUKO0fEhgIuMA4ZEVmiuE0=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "5e54f9e2233c68c2d367bb3fe35267f149ccea10", + "rev": "fbe239eb3d8e4f7cb437cb7f6772b9953efaeec3", "type": "github" }, "original": { @@ -1088,11 +1088,11 @@ ] }, "locked": { - "lastModified": 1764211126, - "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=", + "lastModified": 1764643237, + "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed", + "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1763985453, - "narHash": "sha256-vUqODgLIjeyHN7DP8dVx7oH9yB/L8qcxpN//4EmMQcM=", + "lastModified": 1764698597, + "narHash": "sha256-4f0y9Fo3AChngd/qRQ7wbcy6FH33NFZbyFXn7IeUI14=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "89cd40c646ec5b12e5c20c0e18f082e7629d4819", + "rev": "1da6ebbbcf0301ff773e9c43bdd4c051af9523f7", "type": "github" }, "original": { @@ -1339,11 +1339,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764560400, - "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", + "lastModified": 1764721075, + "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", + "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "type": "github" }, "original": { @@ -1361,11 +1361,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1764599976, - "narHash": "sha256-/S9Wf9lGRqWR2lf7qGROmGBHtEhJLVPkVFMnXTFWcrQ=", + "lastModified": 1764752802, + "narHash": "sha256-cjw3krBZlN/zY+fZbSKmROuvfwkQLxaZcjdhXzDTX88=", "owner": "sxyazi", "repo": "yazi", - "rev": "44e244b9d6d4427d74b58a2a3bc971dc923e12db", + "rev": "c6e03e91d2d3cd45b4728d864e37fb89e5dd526d", "type": "github" }, "original": { diff --git a/home/git.nix b/home/git.nix new file mode 100644 index 0000000..dc11881 --- /dev/null +++ b/home/git.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + programs.git = { + enable = true; + settings = { + user.name = "adikro"; + user.email = "adikro@disroot.org"; + init.defaultBranch = "main"; + }; + }; +} diff --git a/home/home.nix b/home/home.nix index f4342a2..f606bd5 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,9 +1,8 @@ { pkgs, inputs, ... }: - { imports = [ # Window Managers - ./wayland/hyprland/hyprland.nix + # ./wayland/hyprland/hyprland.nix ./wayland/niri/niri.nix # Wayland specific programs ./wayland/waybar.nix @@ -12,14 +11,17 @@ ./editors/nixvim.nix ./editors/helix.nix # Programs - ./terminals/foot.nix - ./shells/fish.nix - ./shells/starship.nix + ./terminal/foot.nix + ./terminal/fish.nix + ./terminal/starship.nix + ./terminal/utils.nix + ./terminal/btop.nix ./programs/spicetify.nix ./programs/nixcord.nix ./programs/yazi.nix # Other ./xdg.nix + ./git.nix ]; home.username = "adam"; @@ -27,11 +29,8 @@ home.stateVersion = "25.05"; home.packages = with pkgs; [ + ncdu halloy - xdg-utils - wofi - librewolf - firefox equibop inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww @@ -40,9 +39,7 @@ satty veracrypt brave - ripgrep qbittorrent-enhanced - fastfetch foot bitwarden-desktop yt-dlp_git @@ -56,17 +53,6 @@ alsa-utils ]; - programs.btop.enable = true; - - programs.git = { - enable = true; - settings = { - user.name = "adikro"; - user.email = "adikro@disroot.org"; - init.defaultBranch = "main"; - }; - }; - gtk = { enable = true; colorScheme = "dark"; diff --git a/home/shells/fish.nix b/home/shells/fish.nix deleted file mode 100644 index 9634249..0000000 --- a/home/shells/fish.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -{ - programs.fish = { - enable = true; - - interactiveShellInit = - '' - set fish_greeting - fastfetch - ''; - - shellAliases = { - gs = "git status"; - }; - }; -} diff --git a/home/shells/starship.nix b/home/shells/starship.nix deleted file mode 100644 index bd4aa3c..0000000 --- a/home/shells/starship.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - programs.starship = { - enable = true; - - settings = { - add_newline = true; - }; - }; -} diff --git a/home/terminal/btop.nix b/home/terminal/btop.nix new file mode 100644 index 0000000..dcd59ed --- /dev/null +++ b/home/terminal/btop.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + programs.btop = { + enable = true; + }; +} diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix new file mode 100644 index 0000000..f1ad64d --- /dev/null +++ b/home/terminal/fish.nix @@ -0,0 +1,64 @@ +{ pkgs, ... }: +{ + programs.fish = { + enable = true; + + interactiveShellInit = '' + set fish_greeting + fastfetch + ''; + + shellAliases = { + nos = "nh os switch"; + nob = "nh os boot"; + nfu = "nix flake update"; + ll = "ls -lah"; + la = "ls -A"; + md = "mkdir -p"; + rmf = "rm -rf"; + gl = "git log --oneline --graph --decorate"; + untar = "tar -xzvf"; + tarc = "tar -czvf"; + ff = "fastfetch"; + cat = "bat"; + ls = "eza"; + find = "fd"; + grep = "rg"; + }; + + plugins = [ + { + name = "transient-fish"; + src = pkgs.fishPlugins.transient-fish.src; + } + { + name = "fishbang"; + src = pkgs.fishPlugins.fishbang.src; + } + { + name = "puffer"; + src = pkgs.fishPlugins.puffer.src; + } + { + name = "pisces"; + src = pkgs.fishPlugins.pisces.src; + } + { + name = "fzf-fish"; + src = pkgs.fishPlugins.fzf-fish.src; + } + { + name = "fish-you-should-use"; + src = pkgs.fishPlugins.fish-you-should-use.src; + } + { + name = "colored-man-pages"; + src = pkgs.fishPlugins.colored-man-pages.src; + } + { + name = "fifc"; + src = pkgs.fishPlugins.fifc.src; + } + ]; + }; +} diff --git a/home/terminals/foot.nix b/home/terminal/foot.nix index 5c3098b..5c3098b 100644 --- a/home/terminals/foot.nix +++ b/home/terminal/foot.nix diff --git a/home/terminal/starship.nix b/home/terminal/starship.nix new file mode 100644 index 0000000..82ab84e --- /dev/null +++ b/home/terminal/starship.nix @@ -0,0 +1,111 @@ +{ ... }: +{ + programs.starship = { + enable = true; + settings = { + add_newline = true; + aws.disabled = true; + battery.disabled = true; + buf.disabled = true; + bun.disabled = true; + c.format = "[$symbol ]($style)"; + cpp = { + disabled = false; + format = "[$symbol ]($style)"; + }; + cmake.disabled = true; + cobol.disabled = true; + # cmd_duration = { + # min_time = 3; + # show_notifications = true; + # min_time_to_notify = 30; + # }; + conda.disabled = true; + container.disabled = true; + crystal.disabled = true; + daml.disabled = true; + dart.disabled = true; + deno.disabled = true; + directory = { + truncate_to_repo = false; + read_only = ""; + }; + docker_context = { + format = "[$symbol ]($style)"; + symbol = ""; + }; + dotnet.disabled = true; + elixir.disabled = true; + elm.disabled = true; + erlang.disabled = true; + fennel.disabled = true; + fortran.disabled = true; + gcloud.disabled = true; + git_commit.tag_symbol = ""; + git_status = { + conflicted = ""; + ahead = ""; + behind = ""; + diverged = ""; + renamed = ""; + deleted = "x"; + }; + gleam.disabled = true; + golang.disabled = true; + guix_shell.disabled = true; + gradle.disabled = true; + haskell.disabled = true; + haxe.disabled = true; + helm.disabled = true; + hostname.format = "[$hostname ]($style) "; + java.disabled = true; + jobs.symbol = ""; + julia.disabled = true; + kotlin.disabled = true; + lua.disabled = true; + meson.disabled = true; + mojo.disabled = true; + nats.disabled = true; + netns.disabled = true; + nim.disabled = true; + nix_shell.format = "[$symbol$state ]($style)"; + nodejs.disabled = true; + ocaml.disabled = true; + odin.disabled = true; + opa.disabled = true; + openstack.disabled = true; + package.disabled = true; + perl.disabled = true; + php.disabled = true; + pixi.disabled = true; + pulumi.disabled = true; + purescript.disabled = true; + python = { + symbol = ""; + format = "[$symbol ]($style)"; + }; + quarto.disabled = true; + rlang.disabled = true; + raku.disabled = true; + red.disabled = true; + ruby.disabled = true; + rust.symbol = ""; + scala.disabled = true; + singularity.disabled = true; + solidity.disabled = true; + spack.disabled = true; + # sudo = { + # format = "[sudo ]($style)"; + # disabled = false; + # }; + swift.disabled = true; + terraform.disabled = true; + typst.disabled = true; + vagrant.disabled = true; + vlang.disabled = true; + vcsh.disabled = true; + xmake.disabled = true; + zig.disabled = true; + }; + }; +} diff --git a/home/terminal/utils.nix b/home/terminal/utils.nix new file mode 100644 index 0000000..c408e4a --- /dev/null +++ b/home/terminal/utils.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +{ + programs.zoxide = { + enable = true; + options = [ + "--cmd cd" + ]; + }; + programs.bat = { + enable = true; + config = { + theme = "gruvbox-dark"; + tabs = "2"; + }; + }; + home.packages = with pkgs; [ + fzf + fd + chafa + hexyl + eza + ripgrep + procs + fastfetch + ]; +} diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix index e14f224..60a5e16 100644 --- a/home/wayland/niri/niri.nix +++ b/home/wayland/niri/niri.nix @@ -68,7 +68,6 @@ }; }; spawn-at-startup = [ - { command = [ "dbus-update-activation-environment" "--systemd" "DISPLAY" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP" "SWAYSOCK" "XDG_SESSION_TYPE" "NIXOS_OZONE_WL" ]; } { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } { command = [ "awww-daemon" ]; } { command = [ "wl-paste --watch cliphist store" ]; } diff --git a/home/xdg.nix b/home/xdg.nix index be43d92..a587d04 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -16,7 +16,7 @@ extraConfig = { XDG_PROJECTS_DIR = "$HOME/proj"; - XDG_GAMES_DIR = "$HOME/Games"; + XDG_GAMES_DIR = "$HOME/games"; XDG_MEDIA_DIR = "/media"; XDG_SS_DIR = "/media/ss"; XDG_CLIPS_DIR = "/media/clips"; @@ -26,7 +26,7 @@ }; home.sessionVariables = { XDG_PROJECTS_DIR = "$HOME/proj"; - XDG_GAMES_DIR = "$HOME/Games"; + XDG_GAMES_DIR = "$HOME/games"; XDG_MEDIA_DIR = "/media"; XDG_SS_DIR = "/media/ss"; XDG_CLIPS_DIR = "/media/clips"; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index efec049..9520908 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -12,7 +12,7 @@ ../../modules/networking.nix ../../modules/scx.nix ../../modules/tor.nix - ../../modules/hyprland.nix + # ../../modules/hyprland.nix ../../modules/niri.nix ../../modules/ollama.nix inputs.home-manager.nixosModules.home-manager @@ -92,10 +92,10 @@ services.lact.enable = true; enable = true; enable32Bit = true; }; - amdgpu = { - initrd.enable = true; - overdrive.enable = true; - }; + # amdgpu = { + # initrd.enable = true; + # overdrive.enable = true; + # }; }; chaotic = { @@ -108,16 +108,7 @@ chaotic = { }; }; -services.dbus.enable = true; - -xdg.portal = { - enable = true; - xdgOpenUsePortal = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - ]; -}; +xdg.portal.enable = true; time.timeZone = "Europe/Warsaw"; @@ -143,11 +134,7 @@ xdg.portal = { }; environment.sessionVariables = { - NH_FLAKE = "/etc/nixos"; NIXOS_OZONE_WL = "1"; - MOZ_ENABLE_WAYLAND = "1"; - GDK_BACKEND = "wayland"; - QT_QPA_PLATFORM = "wayland"; ELECTRON_ENABLE_WAYLAND = "1"; }; @@ -159,10 +146,15 @@ environment.sessionVariables = { home = "/home/adam"; shell = pkgs.fish; }; + + programs.nh = { + enable = true; + flake = "/etc/nixos"; + }; environment.systemPackages = with pkgs; [ + gnome-keyring kdePackages.dolphin - dbus swaylock-effects swayidle helvum @@ -171,8 +163,6 @@ environment.sessionVariables = { winetricks tuigreet linux-firmware - dbus - nh mangohud cliphist wl-clipboard diff --git a/modules/boot.nix b/modules/boot.nix index 587b43f..0054804 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -18,6 +18,7 @@ "quiet" ]; # kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { mArch = "ZEN4"; }; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; + # kernelPackages = pkgs.linuxPackages_6_12; }; } diff --git a/modules/ollama.nix b/modules/ollama.nix index 326e8c5..50b9471 100644 --- a/modules/ollama.nix +++ b/modules/ollama.nix @@ -1,6 +1,6 @@ { ... }: { - fileSystems."/var/lib/ollama/models" = { + fileSystems."/models" = { device = "/home/ollama"; fsType = "none"; options = [ "bind" ]; @@ -9,12 +9,14 @@ services.ollama = { enable = true; acceleration = "rocm"; - # loadModels = [ - # "deepseek-r1:14b" - # ]; - # syncModels = true; + loadModels = [ + "deepseek-r1:14b" + "qwen3:14b" + "qwen3-coder:30b" + ]; + syncModels = true; user = "ollama"; - models = "/var/lib/ollama/models"; + models = "/models"; }; services.nextjs-ollama-llm-ui.enable = true; } |