diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 87783f8..13eff77 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -35,6 +35,7 @@ modules.lavd modules.ai modules.omp + modules.podman ]; nixos = diff --git a/config/modules/fish.nix b/config/modules/fish.nix index a74a404..b520dfb 100644 --- a/config/modules/fish.nix +++ b/config/modules/fish.nix @@ -18,6 +18,9 @@ set -g theme_display_user yes set -g fish_color_autosuggestion 6F6578 alias nik 'nix' + if not set -q TMUX + set -gx COLORTERM truecolor + end ''; # alias nos 'sudo echo; sudo nixos-rebuild switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json' # alias hms 'home-manager switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json' diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index fe619e3..0684742 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -36,7 +36,7 @@ colorschemes.gruvbox-material.enable = true; extraPackages = with pkgs; [ # formatters - nixfmt + alejandra rustfmt # misc ripgrep @@ -60,7 +60,7 @@ enable = true; settings = { formatters_by_ft = { - nix = [ "nixfmt" ]; + nix = [ "alejandra" ]; rust = [ "rustfmt" ]; "_" = [ "squeeze_blanks" @@ -187,8 +187,8 @@ "" = "cmp.mapping.close()"; "" = "cmp.mapping.scroll_docs(4)"; "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; + "" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else fallback() end end, {'i', 's'})"; + "" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})"; }; }; }; @@ -208,6 +208,9 @@ enable = true; grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ bash + css + html + javascript json lua make @@ -216,6 +219,8 @@ nix regex toml + tsx + typescript vim vimdoc xml @@ -224,6 +229,7 @@ ]; settings = { highlight.enable = true; + indent.enable = true; }; }; }; diff --git a/config/modules/tmux.nix b/config/modules/tmux.nix index 8f74ae2..d777708 100644 --- a/config/modules/tmux.nix +++ b/config/modules/tmux.nix @@ -11,10 +11,11 @@ minimal-tmux-status ]; extraConfig = '' - set-option -g default-terminal "xterm-256color" - set -a terminal-features "xterm-256color:RGB" - set -g status-bg black - set -g status-fg white + set-option -g default-terminal "tmux-256color" + set -as terminal-features ",xterm-256color:RGB" + set -g status-bg black + set -g status-fg white + set -g mouse on ''; }; }; diff --git a/flake.lock b/flake.lock index 4c0dd40..3158abd 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1778178024, - "narHash": "sha256-RpzKUH+IaU1kwP9TyzYDcr3kx4ntATWz5FSm0YUVEFw=", + "lastModified": 1778227630, + "narHash": "sha256-IZIpCvjTLn6dzgFa6vOB6rUkMp3gktQy8suVXkPfvSg=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "633675209cb11d50c5bb05283dbbdd9aa1872aec", + "rev": "24da68625ce48a4ea1b28996050f1229e7bc78a2", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1777932387, - "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71a3a77326609675e9f8b51084cf23d5d1945899", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1778248595, - "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", + "lastModified": 1778535464, + "narHash": "sha256-kkUQYSv70wynJ/DfnGals6r98I6bK3CVNVTN1zbAd7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", + "rev": "b659c7ffd40fc9e3bb60d420c79c67e769b9f4ab", "type": "github" }, "original": { @@ -517,11 +517,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1778278927, - "narHash": "sha256-CKBdOcA2xt8MWjvlOICRYgh5lN2nTzy5+jqIP29Y6K4=", + "lastModified": 1778588655, + "narHash": "sha256-7zcsu103YzjuBBx3ToFodHBQl8W3e5GBu8C915I538Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8b78de5d90cb81ebf01df1c84ca205b22aced7d1", + "rev": "d61c96913cbe3c3f9aacc198b1f1e6489349615d", "type": "github" }, "original": { @@ -843,11 +843,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1778224717, - "narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=", + "lastModified": 1778512904, + "narHash": "sha256-GmJZE3/rjeVwB364IGClx4TV50T5ey5V+48f0t8AUD4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110", + "rev": "8994a3e53989f8ce9e6f16c29da15c08e0056402", "type": "github" }, "original": { @@ -876,11 +876,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1778221858, - "narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=", + "lastModified": 1778389445, + "narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=", "owner": "YaLTeR", "repo": "niri", - "rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59", + "rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1778181525, - "narHash": "sha256-U+P5tE3OwxR0j41HABzpi2po3LAiJJ9kBv7jOjoGdhg=", + "lastModified": 1778438210, + "narHash": "sha256-QFqKZ1PvbuXOJfH+QfhEAQW5TVrFBDMc6kRkii4l7uk=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "0bbe21311da577d356ee096a03e379d17cf07279", + "rev": "fd9bda8a7986c9d35c4e5462f0be1d42ea529812", "type": "github" }, "original": { @@ -945,11 +945,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1778430510, + "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575", "type": "github" }, "original": { @@ -990,11 +990,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778157832, - "narHash": "sha256-KDidG68ivbHpI9mwl9NK4gARAROxEy3bZPe2BBo5ZyM=", + "lastModified": 1778401622, + "narHash": "sha256-+0rgLm/T6U2I/0KrgUOz5471i6nDVFMihe4Vy/eAmNk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec299c6a33eee9baf5b4d72881ca2f15c06b4f01", + "rev": "eeac4f06ba6d4c5540c4838d13b31a2cbe0e104b", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1778124196, - "narHash": "sha256-Z5mLDoR8p0d7psIY4LnyaHHRykXngMcWXTZ9JWvtvPc=", - "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92", + "lastModified": 1778458615, + "narHash": "sha256-UuHF8sb6WETWb7HPfOvOVXTAl7UX0VAoxM0Our8WFK0=", + "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre993588.68a8af93ff42/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre995785.c6e5ca3c836a/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1019,11 +1019,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1777918403, - "narHash": "sha256-7QiZv0LcW1yIOLo2LNuCQjWon1Z1r99FwK24hbtBOF4=", + "lastModified": 1778458615, + "narHash": "sha256-cY07EsdhBJ8tFXPzDYevgqxRev9ZLxFonuq9wmq5kwg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "afc5551119aae6eab73a95c1960891cfe63204f6", + "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a", "type": "github" }, "original": { @@ -1067,11 +1067,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-fN6ynMvcdwPDB09LpWJNO5ogu+HFydrBWXJywoI/NNg=", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "lastModified": 1777954456, + "narHash": "sha256-qeRNZKcA0igTdRVnBe6hyo49CqxME92s4G8Sr78ARJw=", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre990025.15f4ee454b1d/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre992384.549bd84d6279/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1085,11 +1085,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777991353, - "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=", + "lastModified": 1778510615, + "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=", "owner": "nix-community", "repo": "nixvim", - "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1", + "rev": "fa8cd368d27cf9541f086485884928315abdcc8c", "type": "github" }, "original": { @@ -1362,11 +1362,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1777789800, - "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=", + "lastModified": 1778540809, + "narHash": "sha256-FNXls2QZTcxY0Dem3QtSewnr8vUKMDsTw9m8pLOnhTc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3", + "rev": "83939d7df4c0f1b8ee88cabde112223280a48554", "type": "github" }, "original": { @@ -1676,11 +1676,11 @@ ] }, "locked": { - "lastModified": 1777612697, - "narHash": "sha256-h+tXBNMDrsKbD1UnYw0IeSIT4RalHtIJ1GLOviib7/8=", + "lastModified": 1778303188, + "narHash": "sha256-zXFSvK80qpI91B7DU9QSExAtafSrz6vzormh2kUi6kQ=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "f9f70d14f9a57c7962c5cfe589461c1391044448", + "rev": "9346c84657a9cab472bc4ee5a2d65d42a72d5346", "type": "github" }, "original": {