From 8378c74c5d91913b2aeb45a5ab84ec997bc834e9 Mon Sep 17 00:00:00 2001 From: Suyashtnt Date: Sat, 8 Jun 2024 22:56:09 +0200 Subject: [PATCH] feat: fix a bunch of stuff --- flake.lock | 162 ++++++++++++------------- systems/modules/greetd/default.nix | 7 +- users/modules/git.nix | 6 +- users/modules/nushell/config/config.nu | 39 +++++- users/modules/webcord/default.nix | 1 + users/tntman/default.nix | 11 +- 6 files changed, 125 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index af24431..5a43f78 100644 --- a/flake.lock +++ b/flake.lock @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", "owner": "ipetkov", "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", "type": "github" }, "original": { @@ -310,11 +310,11 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1713464448, - "narHash": "sha256-Fhir4WlcfEh70V8+oNS1LVAGBftiqtD2qaHzOC8BJUI=", + "lastModified": 1717446130, + "narHash": "sha256-fW+TA5AR9xwRhFHLB2frH3MGlZuL18aRQleg55XGqwA=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "9620bb45ac4cd7b0274c497b2d9d93c4ad9364ee", + "rev": "517daa4ed9168855c202ba2fd28920f6ee17249f", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717146521, - "narHash": "sha256-tO5THLapCBZ7IGEeROvPitB1FYTlZK4RO/uCoTn+0q4=", + "lastModified": 1717866433, + "narHash": "sha256-NYXyErhHxf0v3nHoqhbCKRkgsKRx9MbvZmHb28gnonA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b95883a0b9701e7d716e5c298e5d7961076301cd", + "rev": "f648fe67704b26f123a6a31953957dadec561380", "type": "github" }, "original": { @@ -536,11 +536,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -818,11 +818,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -903,11 +903,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716894953, - "narHash": "sha256-cx6MsxiFYVDVYUCtgMDqMo12Ogd1+i8NQxKPK63D7yI=", + "lastModified": 1717781382, + "narHash": "sha256-MkIxvLWj+w29ayR/2VliNMijlWKvMyYPBCKGW/a7SRo=", "owner": "helix-editor", "repo": "helix", - "rev": "179673568df2a519fae2537fbc0053a64ecf3d8b", + "rev": "aa1630a41af774946f12872ffa539f3145eac89e", "type": "github" }, "original": { @@ -945,11 +945,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -974,11 +974,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -999,11 +999,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716968065, - "narHash": "sha256-MRgORve3xpie/Cq5r9lmJfbg6e0DGM2IqmBawOW/Ou4=", + "lastModified": 1717860476, + "narHash": "sha256-KIbplcRRwvkITgm7M8qyn662zee6NC9/XyL4hmbhe20=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a60c7283e677ed81a466d1c0c864c8a05e192cac", + "rev": "9994b73ad0af5c9ba5fc4058234cea77d0a1ddb1", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -1145,11 +1145,11 @@ ] }, "locked": { - "lastModified": 1714893907, - "narHash": "sha256-IDYG/OM6MHZDFnGDbV3b4hA/1M2l8mepnrZxOnitl3w=", + "lastModified": 1717697949, + "narHash": "sha256-0udmIW9tlMXYWP0zmcrW3mk2VbQUbhmlpFHhRE5rtF0=", "owner": "suyashtnt", "repo": "kleur", - "rev": "ae72392b44a6223be086ab4327cb7a2bab2019d9", + "rev": "3ac2bd47e9ad3f97e26847c6d55a778781286a5d", "type": "github" }, "original": { @@ -1161,11 +1161,11 @@ "neovide-src": { "flake": false, "locked": { - "lastModified": 1717036279, - "narHash": "sha256-VpeS14JtWrhMalj69ZwnUFc1CMKsxhiN+UQTKD+XHbU=", + "lastModified": 1717373675, + "narHash": "sha256-iBGDxOro1yd98d5XPIw824dapuHDimuP27f/nKbh6qo=", "owner": "neovide", "repo": "neovide", - "rev": "930128b3f0bc3cf443b742257192c585d85c39a4", + "rev": "1db63d93b18cc1eb5ac5b3e67b3ca63505f10800", "type": "github" }, "original": { @@ -1184,11 +1184,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1717086148, - "narHash": "sha256-rZyQv0MdYX+tYoGhc5mV4iZb+kGqA93+k3R1BIRiwXk=", + "lastModified": 1717806683, + "narHash": "sha256-11GHW2BLRQVupjjSGw+oiAVhODUrHdfyg2ZGWft1Hxg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "fe31f9e863e643327e8a5fffa0f4aae9288fd048", + "rev": "645fb803eb27b6eebb4ccacaebc350b328046221", "type": "github" }, "original": { @@ -1200,11 +1200,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1717058786, - "narHash": "sha256-IuoPQ4AMGvSzo8IT4vFVO5rz6l4GMYxO6nLE0CjClzQ=", + "lastModified": 1717789397, + "narHash": "sha256-dgpdjyU8t45bJNg8bZ3FeHo3Wx5FQs9+01qMmxzzBgk=", "owner": "neovim", "repo": "neovim", - "rev": "5c33815448e11b514678f39cecc74e68131d4628", + "rev": "da6f68ee6966ebf434eee840b22a4f45e61d77dd", "type": "github" }, "original": { @@ -1227,11 +1227,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717104623, - "narHash": "sha256-PW8lAi0HEDbmWLPR7rkxXUf9fX8Xiyl30yfjrf/YtvE=", + "lastModified": 1717781177, + "narHash": "sha256-XrrWaNkJIrdrz9WWF5Qd4nSuKX7t81ukXOBf7pRYEIo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4742fdbe28aa9bac9fdd2638c25cd9602dd35e84", + "rev": "32f3b917efcf11d0c62be7e617ad46844b74a651", "type": "github" }, "original": { @@ -1260,11 +1260,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1716990063, - "narHash": "sha256-0Vv125wrFCJgSUSQRqhuHQOopWbOc8ICVeY/d2wAjOg=", + "lastModified": 1717779048, + "narHash": "sha256-UQxcDz9xqOkOxaSg0hAZnlYcN9zp7PkQJciGbjDHLQ8=", "owner": "YaLTeR", "repo": "niri", - "rev": "c8e46b9d172dfa2ca89d82b87055b8e39622f80c", + "rev": "dbf0dddfcc253f9e2b910590ec3d0bd58ed3aa71", "type": "github" }, "original": { @@ -1280,11 +1280,11 @@ ] }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1717744769, + "narHash": "sha256-1usk5faO+KRn/03xKW3G3ex9/wHeLfwKTa7x8QNcygc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "4ac3639cebb6286f1a68d015b80e9e0c6c869ce6", "type": "github" }, "original": { @@ -1311,11 +1311,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1717828156, + "narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "057a7996d012f342a38a26261ee529cebb1755ef", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716941088, - "narHash": "sha256-GKSAGfLNocNTux33YT9GbEXwEewxepwFL+ViX1CrMCQ=", + "lastModified": 1717681334, + "narHash": "sha256-HlvsMH8BNgdmQCwbBDmWp5/DfkEQYhXZHagJQCgbJU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c25325ec30a566f5c0446ceee61ada081903872", + "rev": "31f40991012489e858517ec20102f033e4653afb", "type": "github" }, "original": { @@ -1406,11 +1406,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1717530100, + "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", "type": "github" }, "original": { @@ -1422,11 +1422,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1717530100, + "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", "type": "github" }, "original": { @@ -1454,11 +1454,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -1500,11 +1500,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1680,11 +1680,11 @@ ] }, "locked": { - "lastModified": 1717121863, - "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", "type": "github" }, "original": { @@ -1701,11 +1701,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { @@ -1717,11 +1717,11 @@ "spotify-player-src": { "flake": false, "locked": { - "lastModified": 1716607996, - "narHash": "sha256-bLUPQgqSsE9tF5YiFj5B+Ylyy96DhWFNjwqXbQ9H8uc=", + "lastModified": 1717293745, + "narHash": "sha256-NePSDOrkoIyCPFAUCIV086VyVd+7/hZlGzDQQSv+iAI=", "owner": "aome510", "repo": "spotify-player", - "rev": "3e3d16a6e03c1c7561d384dbb08237ada8fb2e5b", + "rev": "b180b6bab5f5086496e8fb83e467320218289d5e", "type": "github" }, "original": { diff --git a/systems/modules/greetd/default.nix b/systems/modules/greetd/default.nix index 3002871..42c506b 100644 --- a/systems/modules/greetd/default.nix +++ b/systems/modules/greetd/default.nix @@ -2,11 +2,15 @@ programs.regreet = { enable = true; settings = { - background.path = "${wallpapers}/Orbit.png"; + background = { + path = "${wallpapers}/Orbit.png"; + fit = "Cover"; + }; GTK = { icon_theme_name = "Papirus-Dark"; font_name = "Inter 13"; cursor_theme_name = "Catppuccin-Mocha-Lavender-Cursors"; + theme_name = "adw-gtk3"; }; commands = { reboot = ["systemctl" "reboot"]; @@ -19,7 +23,6 @@ enable = true; settings = { command = "dbus-run-session cage -s -- regreet"; - user = "tntman"; }; }; } diff --git a/users/modules/git.nix b/users/modules/git.nix index 8a44da0..6f71888 100644 --- a/users/modules/git.nix +++ b/users/modules/git.nix @@ -13,9 +13,7 @@ extraConfig = { init = {defaultBranch = "main";}; - diff = { tool = "difftastic"; }; - difftool = { prompt = false; }; - pager = { difftool = true; }; + difftool = { prompt = false; tool = "difftastic"; }; "difftool \"difftastic\"" = { cmd = ''difft "$LOCAL" "$REMOTE"''; }; @@ -43,7 +41,7 @@ services = { gpg-agent = { enable = true; - pinentryPackage = pkgs.pinentry-qt; + pinentryPackage = pkgs.pinentry-gnome3; defaultCacheTtl = 1800; maxCacheTtl = 7200; }; diff --git a/users/modules/nushell/config/config.nu b/users/modules/nushell/config/config.nu index 7ab86a2..66058a6 100644 --- a/users/modules/nushell/config/config.nu +++ b/users/modules/nushell/config/config.nu @@ -153,7 +153,34 @@ $env.config = { buffer_editor: "nvim" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL use_ansi_coloring: true edit_mode: vi # emacs, vi - shell_integration: true # enables terminal markers and a workaround to arrow keys stop working issue + shell_integration: { + # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title + osc2: true + # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory + osc7: true + # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8 + osc8: true + # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal + osc9_9: false + # osc133 is several escapes invented by Final Term which include the supported ones below. + # 133;A - Mark prompt start + # 133;B - Mark prompt end + # 133;C - Mark pre-execution + # 133;D;exit - Mark execution finished with exit code + # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is + osc133: true + # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features + # 633;A - Mark prompt start + # 633;B - Mark prompt end + # 633;C - Mark pre-execution + # 633;D;exit - Mark execution finished with exit code + # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce + # 633;P;Cwd= - Mark the current working directory and communicate it to the terminal + # and also helps with the run recent menu in vscode + osc633: true + # reset_application_mode is escape \x1b[?1l and was added to help ssh work better + reset_application_mode: true + } show_banner: false # true or false to enable or disable the banner render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. @@ -456,14 +483,14 @@ let carapace_completer = {|spans: list| } let specialized_completer = {|spans: list| - return (match $spans.0 { + match $spans.0 { __zoxide_z => $zoxide_completer __zoxide_zi => $zoxide_completer _ => $null_completer - } | do $in $spans) + } | do $in $spans } -let multiple_completers = {|spans: list| +def multiple_completers [spans: list] { let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion) let spans = if $expanded_alias != null { @@ -492,10 +519,12 @@ let multiple_completers = {|spans: list| $null_completer } +let completer = {|spans: list| multiple_completers $spans } + $env.config.completions.external = { enable: true max_results: 100 - completer: $multiple_completers + completer: $completer } let cachixExists = ("/etc/cachix-agent.token" | path exists) diff --git a/users/modules/webcord/default.nix b/users/modules/webcord/default.nix index 77c0506..74706ca 100644 --- a/users/modules/webcord/default.nix +++ b/users/modules/webcord/default.nix @@ -2,6 +2,7 @@ home.packages = [ (pkgs.vesktop.override { withSystemVencord = false; + electron = pkgs.electron_24; }) ]; } diff --git a/users/tntman/default.nix b/users/tntman/default.nix index 5dd49f8..14d9c42 100644 --- a/users/tntman/default.nix +++ b/users/tntman/default.nix @@ -14,7 +14,6 @@ ezModules.niri ezModules.openrgb ezModules.playerctl - ezModules.swaylock ezModules.syncthing ezModules.xdg ezModules.ags @@ -52,7 +51,6 @@ gnome.nautilus # file manager loupe # image viewer kooha # for screen recording - thunderbird # email go brrr fragments # for torrenting... :cluelesser: (pkgs.cavalier.overrideAttrs (old: rec { @@ -70,23 +68,16 @@ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeDeps} ''; })) # le music vis - cava # le dep for le music vis sptlrx # funni lyrics inputs.zotero-nix.packages.${pkgs.system}.zotero # reference manager go brrr - jetbrains-toolbox # jetbran go brrr - bitwarden # password manager go brrr fractal # matrix go brrr - krita # drawing go brrr - inkscape # drawing vectors go brrr - strawberry-qt6 # music go brrr libreoffice # presentations and stuff go brrr # CLI utils btop # monitoring stuff ripgrep # searching stuff cachix # caching stuff - bitwarden-cli # password manager stuff cloudflared # ssh tunnel stuff nix-output-monitor # building stuff ]; @@ -100,4 +91,6 @@ home-manager.enable = true; nix-index-database.comma.enable = true; }; + + services.easyeffects.enable = true; }