From 803585323bdd11dba7113f66d94f0357f4bfe1ce Mon Sep 17 00:00:00 2001 From: adikro Date: Sat, 22 Nov 2025 17:13:56 +0100 Subject: changed niri, nixcord and yazi configs --- flake.lock | 279 +++++++++++++------------------------------- flake.nix | 14 +-- home/editors/nixvim.nix | 1 + home/home.nix | 1 + home/programs/nixcord.nix | 17 +-- home/programs/yazi.nix | 7 ++ home/wayland/niri/binds.nix | 15 +++ 7 files changed, 114 insertions(+), 220 deletions(-) create mode 100644 home/programs/yazi.nix diff --git a/flake.lock b/flake.lock index c206451..67535cc 100644 --- a/flake.lock +++ b/flake.lock @@ -55,27 +55,6 @@ "url": "https://codeberg.org/LGFae/awww" } }, - "bemenu": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756454762, - "narHash": "sha256-086dwnemI5jZgcZM6/yKG/oGK3v0FeebUDcCl80ewKs=", - "owner": "Cloudef", - "repo": "bemenu", - "rev": "44b82f9f3fb9f04acfaa89471dddc05a20e16883", - "type": "github" - }, - "original": { - "owner": "Cloudef", - "repo": "bemenu", - "type": "github" - } - }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -167,22 +146,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1751685974, - "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", - "ref": "refs/heads/main", - "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", - "revCount": 92, - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1747046372, @@ -206,11 +169,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -245,32 +208,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nvf", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -295,14 +237,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -313,7 +255,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -351,27 +293,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1763430944, - "narHash": "sha256-tL2I302ZrTeo13D99vg4v/VajVCSHdOx5RncpMcjqa0=", - "owner": "helix-editor", - "repo": "helix", - "rev": "68c7e8757f0183adeb01ba1fbbabd1cee2885b70", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -485,15 +406,15 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1763750925, - "narHash": "sha256-Q5IO8VKW2fFHb6Ix6auy6SEMA6NS6pNeuefBai4+PHY=", + "lastModified": 1763819976, + "narHash": "sha256-W/893N/ifviI1PP1BVIwhYhstN8s5UOsi5lvaYupXhA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "abb2f7ee6fc99c31b6fac05568f29c92b59565df", + "rev": "e584a8bade2617899d69ae6f83011d0c1d2a9df7", "type": "github" }, "original": { @@ -770,21 +691,6 @@ "type": "github" } }, - "mnw": { - "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "mnw", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-parts": "flake-parts", @@ -794,11 +700,11 @@ ] }, "locked": { - "lastModified": 1763683496, - "narHash": "sha256-k20voxbsi+899PeXlvWpKU5tcgNYfNqC52rgrh+MOto=", + "lastModified": 1763769887, + "narHash": "sha256-Viyww4Atra7fD4IuhUwFGBtkyIgzuG3lLXu9gdGdEaU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1ddc8e956c8165df29735202b76bb0cfa827916d", + "rev": "34efe16d64996dca36f9bae9fb954a867f9d2680", "type": "github" }, "original": { @@ -810,11 +716,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1763682595, - "narHash": "sha256-/dUf5I0DyLvPgFzjJj0/lUHKZ2M1sVlbYCgudDabxIo=", + "lastModified": 1763766790, + "narHash": "sha256-GLflfd2+d4KEwvwapZGvjVuYUFAsbpDxEkgmOni89JM=", "owner": "neovim", "repo": "neovim", - "rev": "a8b9660ca3452a27b68bf914f618df2d78b64180", + "rev": "1c12073db6c64eb365748f153f96be9b0fe61070", "type": "github" }, "original": { @@ -835,11 +741,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763739228, - "narHash": "sha256-taQ7h8kkyigrdiAHilUXOZiqdT/cCYcpxQentuH+Krc=", + "lastModified": 1763804463, + "narHash": "sha256-iPSL5ONtFDbocfEGCgR8Ik72VRDiS4Nuu7i27kmJ0jQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4708ce5f7d7c7aec103e22c87c11a711eeafd1fa", + "rev": "960b925b8860e2c7b0149a530041358aa3201fbf", "type": "github" }, "original": { @@ -868,11 +774,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763729389, - "narHash": "sha256-VcToDv3/lw3q3sVIqQsMUhSGKEVdQM4h6rnr/XhPBwM=", + "lastModified": 1763799335, + "narHash": "sha256-b6hgDHjrLgTp4Y8DD5woGChg0R+yH16m0ZWVi9BhjrA=", "owner": "YaLTeR", "repo": "niri", - "rev": "012700dd549a79c501bcab92839e5dcc46c372b5", + "rev": "cfc01b895c0c7cbb9692852488675cc46693bd2a", "type": "github" }, "original": { @@ -913,11 +819,11 @@ ] }, "locked": { - "lastModified": 1763740867, - "narHash": "sha256-93safrqdU7Vo7LKoxVPbZ+ksUVTYzDcIFG0EaEWb3eU=", + "lastModified": 1763819073, + "narHash": "sha256-oi+Nd8O+lWCj0Jh+8Px3UAo82HMTB2AaPiJsy5iUPt8=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "ce6a071ea0439fbef6588e77e7d4e7e594c41f8c", + "rev": "0bb86069c738dd300458ebdcd93b05cd3204a155", "type": "github" }, "original": { @@ -1028,14 +934,14 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1763729894, - "narHash": "sha256-hTWn0Z/BM5wzrnzY3RVNyXbguJBFGksatRtQvjCOqM8=", + "lastModified": 1763819965, + "narHash": "sha256-zDXFIuTMrmpf6xzDebNdQTv3qNs3BFJrhHa+qYbzDko=", "owner": "nix-community", "repo": "nixvim", - "rev": "e13ceae64fbdf1475ee71d4170dcd2869e17cfff", + "rev": "2606dc719488065e735ff0fc622d743566b21ad4", "type": "github" }, "original": { @@ -1051,11 +957,11 @@ ] }, "locked": { - "lastModified": 1763761248, - "narHash": "sha256-JNeTe1wnCjuLXaK88ilcNsPpbZmyU74DW40XylFrO24=", + "lastModified": 1763826260, + "narHash": "sha256-+NRo9y4uHeoTNVonBWlKR5w6OjMtcxQg53whgOroQPA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1bf54de99c9577959941ef1a55f1442bce04ba35", + "rev": "5ee808e186d21f130935b73310c6f2375ad6176e", "type": "github" }, "original": { @@ -1066,7 +972,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1087,30 +993,6 @@ "type": "github" } }, - "nvf": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", - "mnw": "mnw", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1762622004, - "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", - "owner": "NotAShelf", - "repo": "nvf", - "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", - "type": "github" - }, - "original": { - "owner": "NotAShelf", - "repo": "nvf", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1158,10 +1040,8 @@ "root": { "inputs": { "awww": "awww", - "bemenu": "bemenu", "chaotic": "chaotic", "disko": "disko", - "helix": "helix", "home-manager": "home-manager_2", "hyprland": "hyprland", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -1171,11 +1051,11 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "noctalia": "noctalia", - "nvf": "nvf", "prismlauncher": "prismlauncher", "satty": "satty", "spicetify-nix": "spicetify-nix", - "waybar": "waybar" + "waybar": "waybar", + "yazi": "yazi" } }, "rust-overlay": { @@ -1222,17 +1102,14 @@ }, "rust-overlay_3": { "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759631821, - "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", + "lastModified": 1748140821, + "narHash": "sha256-GZcjWLQtDifSYMd1ueLDmuVTcQQdD5mONIBTqABooOk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", + "rev": "476b2ba7dc99ddbf70b1f45357dbbdbdbdfb4422", "type": "github" }, "original": { @@ -1243,14 +1120,17 @@ }, "rust-overlay_4": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "yazi", + "nixpkgs" + ] }, "locked": { - "lastModified": 1748140821, - "narHash": "sha256-GZcjWLQtDifSYMd1ueLDmuVTcQQdD5mONIBTqABooOk=", + "lastModified": 1762396738, + "narHash": "sha256-BarSecuxtzp1boERdABLkkoxQTi6s/V33lJwUbWLrLY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "476b2ba7dc99ddbf70b1f45357dbbdbdbdfb4422", + "rev": "c63598992afd54d215d54f2b764adc0484c2b159", "type": "github" }, "original": { @@ -1264,14 +1144,14 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1763760407, - "narHash": "sha256-LW3wnJT4/Sy9nWVe/kd4b/Lej9YT8De9078PiljR8QU=", + "lastModified": 1763816411, + "narHash": "sha256-8tyJCM3RUGM9KVyE2D1T1kc6MRwo+5EEI5cz9oX2Dzc=", "owner": "gabm", "repo": "Satty", - "rev": "2877a3b5c34aaded7792ea55cdc8efc480fd53f8", + "rev": "509c0de4048ce2843057064bb54bbd608cabbab0", "type": "github" }, "original": { @@ -1285,7 +1165,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1763267524, @@ -1302,21 +1182,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1331,7 +1196,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1346,7 +1211,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1361,7 +1226,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1376,7 +1241,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1393,7 +1258,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ] @@ -1485,6 +1350,28 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "yazi": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1763600401, + "narHash": "sha256-druDd9HC3UxZSzCY+qaFp9QDCGfzrhv+Zrytia6lJUE=", + "owner": "sxyazi", + "repo": "yazi", + "rev": "a08b345a02c6b4c65239a0522f67e77a0132e88b", + "type": "github" + }, + "original": { + "owner": "sxyazi", + "repo": "yazi", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 67eee59..7ef56f3 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,8 @@ inputs.nixpkgs.follows= "nixpkgs"; }; - bemenu = { - url = "github:Cloudef/bemenu"; + yazi = { + url = "github:sxyazi/yazi"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -59,21 +59,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nvf = { - url = "github:NotAShelf/nvf"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - helix = { - url = "github:helix-editor/helix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixcord = { url = "github:KaylorBen/nixcord"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix index cddfec0..6bfc119 100644 --- a/home/editors/nixvim.nix +++ b/home/editors/nixvim.nix @@ -7,6 +7,7 @@ viAlias = true; vimAlias = true; + defaultEditor = true; waylandSupport = true; colorschemes.gruvbox.enable = true; diff --git a/home/home.nix b/home/home.nix index afa9053..636225c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -17,6 +17,7 @@ ./shells/starship.nix ./programs/spicetify.nix ./programs/nixcord.nix + ./programs/yazi.nix # Other ./xdg.nix ]; diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix index 2e825e3..98e0a74 100644 --- a/home/programs/nixcord.nix +++ b/home/programs/nixcord.nix @@ -9,11 +9,11 @@ equicord.enable = true; autoscroll.enable = true; openASAR.enable = true; - settings = { - MINIMIZE_TO_TRAY = false; - OPEN_ON_STARTUP = false; - ANIMATE_AVATARS = false; - }; + # settings = { + # MINIMIZE_TO_TRAY = false; + # OPEN_ON_STARTUP = false; + # ANIMATE_AVATARS = false; + # }; }; config = { frameless = true; @@ -225,13 +225,6 @@ enable = true; noSpotifyAutoPause = false; }; - timezones = { - enable = true; - _24hTime = true; - # setDatabaseTimezone = { }; - showMessageHeaderTime = false; - showOwnTimezone = false; - }; typingIndicator.enable = true; typingTweaks.enable = true; unindent.enable = true; diff --git a/home/programs/yazi.nix b/home/programs/yazi.nix new file mode 100644 index 0000000..a8e2911 --- /dev/null +++ b/home/programs/yazi.nix @@ -0,0 +1,7 @@ +{ inputs, ... }: +{ +# nixpkgs.overlays = [ inputs.yazi.overlays.default ]; + programs.yazi = { + enable = true; + }; +} diff --git a/home/wayland/niri/binds.nix b/home/wayland/niri/binds.nix index 325b60b..e65a595 100644 --- a/home/wayland/niri/binds.nix +++ b/home/wayland/niri/binds.nix @@ -29,6 +29,21 @@ "Mod+Shift+P".action = power-off-monitors; "Mod+W".action = toggle-column-tabbed-display; + "Mod+S".action = spawn "sh" "-c" + '' + filename="/media/ss/$(date +%Y-%m-%d_%H-%M-%S).png" + grim -g "$(slurp)" - | tee "$filename" | wl-copy + ''; + + "Mod+Shift+S".action = spawn "sh" "-c" + '' + filename="/media/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" + satty --filename "$filename" --output-filename "$edited" + wl-copy < "$edited" + ''; # --- System / General --- "Mod+Return".action = spawn "foot"; -- cgit v1.3