From 454222903710bbd438d2a9ed7108a4d89b591e6a Mon Sep 17 00:00:00 2001 From: Ahwx Date: Wed, 19 Feb 2025 12:36:54 +0100 Subject: [PATCH 01/17] feat: adds/removes some stuff --- modules/home/packages.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index ca58b67..6bbf360 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -1,9 +1,6 @@ { inputs, pkgs, ... }: { home.packages = with pkgs; [ - pciutils # List PCI(e) devices and controllers - bandwhich # Terminal bandwidth utilization tool - powertop element-desktop # Nheko is kinda shit so sadly this has to happen iamb # In-terminal-Matrix-messaging signal-desktop # Since the bridge is broken :( @@ -11,7 +8,7 @@ pixcat # Display images in the terminal lm_sensors # Show sensor outputs, i.e. temperatures yubikey-touch-detector # Display notification when YubiKey requires a headpat - bitwarden-cli # Use Bitwarden as a CLI secrets manager + pass # Passwords but CLI # wikit # Wikipedia summaries from the terminal, not added to Nix yet # reader # Firefox reader mode but in the terminal, not added to Nix yet vimv # edit filenames in batch with $EDITOR @@ -27,7 +24,6 @@ openresolv # required for wireguard-tools progress zip - ripdrag pwgen jq tmux @@ -39,14 +35,12 @@ file fzf lazygit - gitleaks # TODO: adds pre-commit hook + gitleaks libreoffice xfce.thunar lunar-client ripgrep yt-dlp - # wineWowPackages.wayland - # element-desktop # wayland version is very laggy for me spotify spotify-player thunderbird From 81372fde974bc283d7f8563e2ebdbb4b2fc14ce3 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 21:53:36 +0100 Subject: [PATCH 02/17] feat: move to librewolf :) --- modules/home/hyprland/config.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 4fcb14b..4f159f9 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -226,7 +226,7 @@ # clipboard manager "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy" - "$mainMod SHIFT, F, exec, firefox" + "$mainMod SHIFT, F, exec, librewolf" "$mainMod SHIFT, W, exec, wdisplays" "$mainMod SHIFT, T, exec, thunderbird" "$mainMod SHIFT, E, exec, element-desktop" @@ -235,8 +235,8 @@ "$mainMod, N,exec, swaync-client -t" # screenshot - "SUPER SHIFT, S, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" - "$mainMod SHIFT, S, exec, grimblast --notify --cursor copy area" + "SUPER SHIFT, S, exec, grimblast save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" + "$mainMod SHIFT, S, exec, grimblast copy area" "$mainMod SHIFT, G, exec, grabtext" # switch focus @@ -334,8 +334,8 @@ "float,udiskie" "float,title:^(Transmission)$" "float,title:^(Volume Control)$" - "float,title:^(Firefox — Sharing Indicator)$" - "move 0 0,title:^(Firefox — Sharing Indicator)$" + "float,title:^(Librewolf — Sharing Indicator)$" + "move 0 0,title:^(Librewolf — Sharing Indicator)$" "size 700 450,title:^(Volume Control)$" "move 40 55%,title:^(Volume Control)$" "workspace 10, thunderbird" @@ -355,7 +355,7 @@ "opacity 1.0 override 1.0 override, class:(Aseprite)" "opacity 1.0 override 1.0 override, class:(Unity)" "idleinhibit focus, class:^(mpv)$" - "idleinhibit fullscreen, class:^(firefox)$" + "idleinhibit fullscreen, class:^(librewolf)$" "float,class:^(pavucontrol-qt)$" "float,class:^(pavucontrol)$" "float,class:^(SoundWireServer)$" From f05b1d5b91277a06eca96dfb69fe276c374fa883 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 21:53:55 +0100 Subject: [PATCH 03/17] feat: adds hyswipe back (seems stable enough now????) --- modules/home/hyprland/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 7900ed4..390ff2a 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -24,7 +24,7 @@ systemd.enable = true; plugins = [ # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace - # inputs.Hyswipe.packages.${pkgs.system}.Hyswipe + inputs.Hyswipe.packages.${pkgs.system}.Hyswipe ]; }; } From 4a78a332b7216261bdee3b93704b9d214665bdb0 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 21:54:05 +0100 Subject: [PATCH 04/17] feat: re-order packages --- modules/home/packages.nix | 115 ++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 55 deletions(-) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 6bbf360..783fb4d 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -1,81 +1,86 @@ { inputs, pkgs, ... }: { home.packages = with pkgs; [ - element-desktop # Nheko is kinda shit so sadly this has to happen - iamb # In-terminal-Matrix-messaging - signal-desktop # Since the bridge is broken :( - tesseract # Screen grabbing text from images/PDFs/etc - pixcat # Display images in the terminal - lm_sensors # Show sensor outputs, i.e. temperatures - yubikey-touch-detector # Display notification when YubiKey requires a headpat - pass # Passwords but CLI - # wikit # Wikipedia summaries from the terminal, not added to Nix yet - # reader # Firefox reader mode but in the terminal, not added to Nix yet - vimv # edit filenames in batch with $EDITOR - # pastel # generate, analyze, convert and manipulate colors - glow # Render Markdown from the terminal - # htmlq # jq but for HTML - eva # Calculator - anki-bin # Flashcards - obs-studio # Record video stuff - exiftool # Read exif data from CLI - translate-shell # Google Translate but in the CLI - wireguard-tools # VPN connections - openresolv # required for wireguard-tools + # Environment shit + tesseract + yubikey-touch-detector + wireguard-tools + openresolv + xdg-utils + killall + libnotify + openssl + pamixer + playerctl + wl-clipboard + cliphist + poweralertd + ffmpeg + unzip + wget + xxd + gcc + gnumake + python3 + + # CLI shit + vimv + iamb + pass + pixcat + lm_sensors + neofetch + hyfetch + glow + eva + exiftool + translate-shell progress zip pwgen jq tmux - wdisplays htop - firefox - nsxiv eza file fzf lazygit gitleaks - libreoffice - xfce.thunar - lunar-client ripgrep yt-dlp - spotify spotify-player - thunderbird - neofetch - hyfetch nodejs_22 yarn + # wikit # Wikipedia summaries from the terminal, not added to Nix yet + # reader # Firefox reader mode but in the terminal, not added to Nix yet + # pastel # generate, analyze, convert and manipulate colors - # C / C++ - gcc - gnumake + # GUI shit + element-desktop + signal-desktop + anki-bin + obs-studio + wdisplays + librewolf + ungoogled-chromium + nsxiv + libreoffice + xfce.thunar + spotify + thunderbird + lxqt.pavucontrol-qt + mpv - # Python - python3 + # Gaming + lunar-client - ffmpeg - killall - libnotify - mpv # video player - openssl - pamixer # pulseaudio command line mixer - lxqt.pavucontrol-qt # pulseaudio volume controle (GUI) - playerctl # controller for media players - wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste) - cliphist # clipboard history manager - poweralertd - unzip - wget - xdg-utils - xxd inputs.alejandra.defaultPackage.${system} inputs.nixvim.packages.${pkgs.system}.default - ]; - # environment.systemPackages = with pkgs; [ - # nodePackages. - # ] + # Email/calendar/etc + neomutt + khard + khal + w3m + ]; } From d22ca949e4d28581a052a258e58aa04bbc31e884 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 21:54:14 +0100 Subject: [PATCH 05/17] flake: update --- flake.lock | 176 +++++++++++++++++++++++------------------------------ 1 file changed, 75 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index ce52928..2731cd1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1737235749, - "narHash": "sha256-YQgW4QifYIcNaFF4nMw0LpllXn0rhk/Yb6cwyH3PB9o=", + "lastModified": 1739004667, + "narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "1b5865f4ac9a04ba614df50de7acfaa40dcb852f", + "rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1733340944, - "narHash": "sha256-/4cZrvnK1m2seORcYP+pAKoziaCgFCIAOpdkYSLUcaQ=", + "lastModified": 1739005621, + "narHash": "sha256-IMipnrVIfjVNFm/pV4kI0y27gVBSTjxWNgRTO6lksjQ=", "owner": "KZDKM", "repo": "Hyswipe", - "rev": "001b5983ea372bc525c246c8280fd57176a2e0b7", + "rev": "cd6f1857e2991ac123b7c16e73a7f6e66244052a", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1738183445, - "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", + "lastModified": 1739103745, + "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", + "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1737579274, - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", + "lastModified": 1739934729, + "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=", "owner": "catppuccin", "repo": "nix", - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", + "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf", "type": "github" }, "original": { @@ -236,11 +236,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -450,11 +450,11 @@ ] }, "locked": { - "lastModified": 1738200030, - "narHash": "sha256-z2DVxun8fEH0yeVIyfL68hXht+k2h3vEwNVxJPOMCgU=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "86a0d627cae02e8cc5d29eeb03de97f8c652a4bb", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1738176500, - "narHash": "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg=", + "lastModified": 1739465511, + "narHash": "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=", "owner": "hyprwm", "repo": "contrib", - "rev": "d449f6e1fc31084437ebc0c45057ee656f593efd", + "rev": "59178a657b7e09ddf82b9e79681f482b6c2f378b", "type": "github" }, "original": { @@ -519,11 +519,11 @@ ] }, "locked": { - "lastModified": 1738178255, - "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1738018829, - "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738192585, - "narHash": "sha256-bqVFSCvN0OzdrdZcvaaJSkttMlXr8tlxnb8q1L0L+ZQ=", + "lastModified": 1739892000, + "narHash": "sha256-kwS/xplOy9ncwjgTr5q3aOIqt4oioE9/+Hm2tMrsnvs=", "ref": "refs/heads/main", - "rev": "d462cc7fa166e1e6a6f14b58a2dd1e8b92e15426", - "revCount": 5760, + "rev": "0137a5f6cdd24d5a10f813572791f1e641221a5b", + "revCount": 5831, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -699,11 +699,11 @@ ] }, "locked": { - "lastModified": 1737981711, - "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -728,11 +728,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -749,11 +749,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1737635601, - "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=", + "lastModified": 1739641805, + "narHash": "sha256-AHxR5PfcYTUY1GX2wmPs9K6GUo9PnL7N8a15tbkXLQE=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", + "rev": "36a24e61be4cb2ef9eab4ac4c9b2e83a7aa26ac9", "type": "github" }, "original": { @@ -771,11 +771,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1737635828, - "narHash": "sha256-e3vsaQSB9F6p8KMRzrK4l+wCgMytw7ocUvxjgmJfjp8=", + "lastModified": 1739712272, + "narHash": "sha256-hWsYFTWgpZvKipKt1LCsG1DA+QpX3A0ccaYuHqwIzmg=", "owner": "hyprwm", "repo": "hyprsunset", - "rev": "cdcf145eec3e4bbb5e07ae16012c825b59efd44e", + "rev": "d1811e4b6b91e0de8aa29b8bde78ec1c44f3debb", "type": "github" }, "original": { @@ -796,11 +796,11 @@ ] }, "locked": { - "lastModified": 1737978343, - "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "type": "github" }, "original": { @@ -871,11 +871,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -959,15 +959,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_7", - "umu": "umu" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1737855374, - "narHash": "sha256-RRGX2C+c+GaR3YMiYm6l/Tp5N/KZtYpiTplUrBwH/og=", + "lastModified": 1739889244, + "narHash": "sha256-crgSbxYkXEVAW3SklAAj64A7fe/DVRGqApUp153aWyA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "4845fe94cda365c7550d9fd1ef899d45df0bc18a", + "rev": "720a606a88dd7b23138c5bc58eb43618f2d091c7", "type": "github" }, "original": { @@ -978,11 +977,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -1009,14 +1008,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs-lib_2": { @@ -1049,11 +1048,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -1145,11 +1144,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1737717945, - "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=", + "lastModified": 1739451785, + "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecd26a469ac56357fd333946a99086e992452b6a", + "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", "type": "github" }, "original": { @@ -1161,11 +1160,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -1244,11 +1243,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1738226941, - "narHash": "sha256-m/XSp9JIkUuZfCO8ya3DXDRBygEChGA2I9n8nqG12Xc=", + "lastModified": 1739903703, + "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", "owner": "nix-community", "repo": "NUR", - "rev": "6668a4066e11f7fe713a90c590a0931dfeb50f1d", + "rev": "2215ad5c4347f522523715e809f5f2022509f504", "type": "github" }, "original": { @@ -1487,31 +1486,6 @@ "type": "github" } }, - "umu": { - "inputs": { - "nixpkgs": [ - "nix-gaming", - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1737834175, - "narHash": "sha256-fhyc89qqYM3ql0k4hJVibAhXvEXOch96hnsEGB7Av3I=", - "ref": "refs/heads/main", - "rev": "4d1860eefd79d6c04e964774155dbe13be65121a", - "revCount": 911, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - }, - "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ From 6b645fb5c21585defbabe10a6256f622d7d6c0c7 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 21:54:50 +0100 Subject: [PATCH 06/17] feat: move to librewolf on yoshino as well TODO: make role instead of other packages list --- modules/home/packages.yoshino.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/packages.yoshino.nix b/modules/home/packages.yoshino.nix index 838e604..cab1e4f 100644 --- a/modules/home/packages.yoshino.nix +++ b/modules/home/packages.yoshino.nix @@ -33,7 +33,7 @@ tmux wdisplays htop - firefox + librewolf nsxiv eza file From 74fa6c87192d9bf35c8cdd9a9819726e9ca84958 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:15:56 +0100 Subject: [PATCH 07/17] feat: adds v4l2loopback to yoshino's kernel packages --- hosts/yoshino/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/yoshino/default.nix b/hosts/yoshino/default.nix index 5c184a4..08dfdb7 100644 --- a/hosts/yoshino/default.nix +++ b/hosts/yoshino/default.nix @@ -36,6 +36,7 @@ [ acpi_call cpupower + v4l2loopback ] ++ [pkgs.cpupower-gui]; }; From 773e40b277686f1db07cee20a196b4eeddfeb138 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:16:31 +0100 Subject: [PATCH 08/17] chore: remove yoshino-specific lists since they're no longer needed, stuff is now in it's host file --- modules/home/default.yoshino.nix | 18 ------- modules/home/packages.yoshino.nix | 85 ------------------------------- 2 files changed, 103 deletions(-) delete mode 100644 modules/home/default.yoshino.nix delete mode 100644 modules/home/packages.yoshino.nix diff --git a/modules/home/default.yoshino.nix b/modules/home/default.yoshino.nix deleted file mode 100644 index d6a0228..0000000 --- a/modules/home/default.yoshino.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ...}: { - imports = - [(import ./git.nix)] # version control - ++ [(import ./swaync/default.nix)] # notification panel - ++ [(import ./fonts.nix)] # fonts - ++ [(import ./hyprland)] # window manager - ++ [(import ./kitty.nix)] # terminal - ++ [(import ./mako.nix)] # notification deamon - ++ [(import ./nvim.nix)] # neovim editor - ++ [(import ./zathura.nix)] # neovim editor - ++ [(import ./packages.yoshino.nix)] # other packages - ++ [(import ./scripts/scripts.nix)] # personal scripts - ++ [(import ./swaylock.nix)] # lock screen - ++ [(import ./waybar)] # status bar - ++ [(import ./wofi.nix)] # launcher - ++ [(import ./zsh.nix)] # shell - ++ [(import ./tmux.nix)]; # terminal multiplexer -} diff --git a/modules/home/packages.yoshino.nix b/modules/home/packages.yoshino.nix deleted file mode 100644 index cab1e4f..0000000 --- a/modules/home/packages.yoshino.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ inputs, pkgs, ... }: -{ - home.packages = with pkgs; [ - pciutils # List PCI(e) devices and controllers - bandwhich # Terminal bandwidth utilization tool - element-desktop # Nheko is kinda shit so sadly this has to happen - signal-desktop # Since the bridge is broken :( - tesseract # Screen grabbing text from images/PDFs/etc - pixcat # Display images in the terminal - lm_sensors # Show sensor outputs, i.e. temperatures - yubikey-touch-detector # Display notification when YubiKey requires a headpat - linuxKernel.packages.linux_hardened.v4l2loopback # Use A7ii as webcam - # wikit # Wikipedia summaries from the terminal, not added to Nix yet - # reader # Firefox reader mode but in the terminal, not added to Nix yet - vimv # edit filenames in batch with $EDITOR - pastel # generate, analyze, convert and manipulate colors - glow # Render Markdown from the terminal - htmlq # jq but for HTML - android-tools # ADB/Fastboot - eva # Calculator - # termpdfpy # Read PDFs from the terminal, errors out for now - anki-bin # Review flashcards - vimv # Bulk rename - exiftool # Read exif data from CLI - translate-shell # Google Translate but in the CLI - wireguard-tools # VPN connections - openresolv # required for wireguard-tools - progress - zip - ripdrag - pwgen - jq - tmux - wdisplays - htop - librewolf - nsxiv - eza - file - fzf - lazygit - gitleaks # TODO: adds pre-commit hook - xfce.thunar - lunar-client - jdk - ripgrep - yt-dlp - wineWowPackages.wayland - spotify - thunderbird - neofetch - hyfetch - nodejs_22 - yarn - - # C / C++ - gcc - gnumake - - # Python - python3 - - ffmpeg - killall - libnotify - man-pages # extra man pages - mpv # video player - openssl - pamixer # pulseaudio command line mixer - lxqt.pavucontrol-qt # pulseaudio volume controle (GUI) - playerctl # controller for media players - wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste) - cliphist # clipboard history manager - unzip - wget - xdg-utils - xxd - inputs.alejandra.defaultPackage.${system} - inputs.nixvim.packages.${pkgs.system}.default - ]; - - # environment.systemPackages = with pkgs; [ - # nodePackages. - # ] -} From 52a82f6adf1a803bfa03c2d24a62436cf2fd0371 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:16:42 +0100 Subject: [PATCH 09/17] feat: comply with new nix package naming for kdenlive --- roles/creative.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/creative.nix b/roles/creative.nix index ee0b0c5..6d19932 100644 --- a/roles/creative.nix +++ b/roles/creative.nix @@ -15,7 +15,7 @@ in { darktable audacity obs-studio - kdenlive + kdePackages.kdenlive ]; }; }; From 13009e9e421df01fea7930ed729eff8367f3dc4a Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:16:47 +0100 Subject: [PATCH 10/17] flake: update --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 3cc52ed..3d2cf2f 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1739004667, - "narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", + "lastModified": 1740777046, + "narHash": "sha256-hPp+DnTYjE6M9Mdau7inbqMeLR1SpSPVyuxd+nabwaA=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", + "rev": "b5c8adb16f4729572c67883da1bcb46e11f195d6", "type": "github" }, "original": { @@ -450,11 +450,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1740845322, + "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1740365530, - "narHash": "sha256-g9Q8wHAbjMOwJgTIV3XuKw7S47b/XnDOgtmQP0lswQI=", + "lastModified": 1740854078, + "narHash": "sha256-y0EWjnJgyQ9SMti5yqKvSMFwhAT2S3iycD1eRf4SXg0=", "ref": "refs/heads/main", - "rev": "3458d7ac93a101ea534ef6d0bcbc32725e267045", - "revCount": 5840, + "rev": "2acbb59bf218331a090f402982f22fd7f85ae50f", + "revCount": 5854, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -962,11 +962,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1740361404, - "narHash": "sha256-hKaJ6QDZuxcbwifzcfLyiK9nmlIx1uQqWQwJ45PBn88=", + "lastModified": 1740838504, + "narHash": "sha256-5pF6whS+PQJlrFHuDNKGBDFT676nFFCJcw68UzMmddM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "1e6dc4b9895602f9459d6ff3a11b0cd144321207", + "rev": "5e173f8c31fd9544002f37c1a107d839fcc83687", "type": "github" }, "original": { @@ -977,11 +977,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -1048,11 +1048,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -1243,11 +1243,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740400501, - "narHash": "sha256-Io6PeaGBb9MN5cFpXzbt9XpB5ZQTeZ3CMmFK/FdaX70=", + "lastModified": 1740858475, + "narHash": "sha256-YIdIgnmg5AlArjennCIv5NqZUU54rGgHxm4lLWqMy3g=", "owner": "nix-community", "repo": "NUR", - "rev": "ef57fcfbc0b94951efd61231cf45d53e3efa72ff", + "rev": "efadff3f90fb07193808c0eff037addae42cfaa7", "type": "github" }, "original": { From b97daf5acd2f3e8454855aa857c4e5cae2dd324e Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:18:07 +0100 Subject: [PATCH 11/17] chore: remove sway/vscodium from packages since i don't use them anyways --- modules/home/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index 4cf86ac..4d904e7 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -4,7 +4,6 @@ ++ [(import ./swaync/default.nix)] ++ [(import ./fonts.nix)] ++ [(import ./hyprland)] - ++ [(import ./sway)] ++ [(import ./kitty.nix)] ++ [(import ./mako.nix)] ++ [(import ./nvim.nix)] @@ -12,7 +11,6 @@ ++ [(import ./packages.nix)] ++ [(import ./scripts/scripts.nix)] ++ [(import ./swaylock.nix)] - ++ [(import ./vscodium.nix)] ++ [(import ./waybar)] ++ [(import ./wofi.nix)] ++ [(import ./zsh.nix)] From e539a642a4560b4cff28a7e0b29b6c228942463b Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:26:04 +0100 Subject: [PATCH 12/17] chore: remove old scripts --- modules/home/scripts/scripts/keybinds.sh | 6 ------ modules/home/scripts/scripts/shutdown-script.sh | 15 --------------- 2 files changed, 21 deletions(-) delete mode 100755 modules/home/scripts/scripts/keybinds.sh delete mode 100755 modules/home/scripts/scripts/shutdown-script.sh diff --git a/modules/home/scripts/scripts/keybinds.sh b/modules/home/scripts/scripts/keybinds.sh deleted file mode 100755 index 4381f42..0000000 --- a/modules/home/scripts/scripts/keybinds.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -config_file=~/.config/hypr/hyprland.conf -keybinds=$(grep -oP '(?<=bind=).*' $config_file) -keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') -wofi -W 750 -dmenu -p "Keybinds" <<< "$keybinds" diff --git a/modules/home/scripts/scripts/shutdown-script.sh b/modules/home/scripts/scripts/shutdown-script.sh deleted file mode 100755 index 8813d2e..0000000 --- a/modules/home/scripts/scripts/shutdown-script.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env zsh - -respond="$(echo "------------- Shutdown --------------\n------------- Restart ---------------\n-------------- Cancel ---------------" | wofi --show dmenu -k /dev/null)" - -if [ $respond = '------------- Shutdown --------------' ] -then - echo "shutdown" - shutdown now -elif [ $respond = '------------- Restart ---------------' ] -then - echo "restart" - reboot -else - notify-send "cancel shutdown" -fi From 8b23576ddfda7b1da9d37183625657c20f73f651 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:26:14 +0100 Subject: [PATCH 13/17] feat: move to dmenu in wallpaper script --- modules/home/scripts/scripts/wallpaper-picker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home/scripts/scripts/wallpaper-picker.sh b/modules/home/scripts/scripts/wallpaper-picker.sh index 1c2bece..899ad1a 100755 --- a/modules/home/scripts/scripts/wallpaper-picker.sh +++ b/modules/home/scripts/scripts/wallpaper-picker.sh @@ -2,11 +2,11 @@ wallpaper_path=$HOME/Pictures/wallpapers wallpapers_folder=$HOME/Pictures/wallpapers/others -wallpaper_name="$(ls $wallpapers_folder | wofi --show dmenu --sort-order=alphabetical)" +wallpaper_name="$(ls $wallpapers_folder | bemenu -l 15)" if [[ -f $wallpapers_folder/$wallpaper_name ]]; then find ~/Pictures/wallpapers -maxdepth 1 -type f -delete cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name wall-change $wallpaper_path/$wallpaper_name else exit 1 -fi \ No newline at end of file +fi From 72899ff8c3db0a226ba14ff384b6a31bcbeb1861 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:26:47 +0100 Subject: [PATCH 14/17] chore: remove mako since i don't use it anymore --- modules/home/mako.nix | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 modules/home/mako.nix diff --git a/modules/home/mako.nix b/modules/home/mako.nix deleted file mode 100644 index bdd387e..0000000 --- a/modules/home/mako.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, pkgs, ... }: -{ - # services = { - # mako = { - # enable = true; - # font = "JetBrainsMono Nerd Font 12"; - # padding = "15"; - # defaultTimeout = 5000; - # borderSize = 2; - # borderRadius = 5; - # backgroundColor = "#1e1e2e"; - # borderColor = "#b4befe"; - # progressColor = "over #313244"; - # textColor = "#cdd6f4"; - # icons = true; - # actions = true; - # extraConfig = '' - # text-alignment=center - # [urgency=high] - # default-timeout=100000000 - # border-color=#fab387 - # ''; - # }; - # }; -} From b5fcf66c9c73bdfc6197f184f94d08489b2e443c Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:26:53 +0100 Subject: [PATCH 15/17] feat: move to bemenu :) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8706b2d..2d255db 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ | --------------------------- | :---------------------------------------------------------------------------------------------: | **Window Manager** | [Hyprland][Hyprland] | | **Bar** | [Waybar][waybar] | -| **Application Launcher** | [wofi][wofi] | +| **Application Launcher** | [bemenu][bemenu] | | **Notification Daemon** | [Mako][mako] | | **Terminal Emulator** | [Kitty][kitty] | | **Shell** | [zsh][zsh] | @@ -224,7 +224,7 @@ Other dotfiles that I learned / copy from: [Hyprland]: https://github.com/hyprwm/Hyprland [Kitty]: https://github.com/kovidgoyal/kitty [Waybar]: https://github.com/Alexays/Waybar -[wofi]: https://hg.sr.ht/~scoopta/wofi +[bemenu]: https://github.com/Cloudef/bemenu [zsh]: https://ohmyz.sh/ [swaylock]: https://github.com/swaywm/swaylock [mpv]: https://github.com/mpv-player/mpv From f7be226c7ff77e224586cffa75d557c4e70859f3 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:27:06 +0100 Subject: [PATCH 16/17] chore: remove mako/wofi from imports --- modules/home/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index 4d904e7..3e85ef2 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -5,14 +5,12 @@ ++ [(import ./fonts.nix)] ++ [(import ./hyprland)] ++ [(import ./kitty.nix)] - ++ [(import ./mako.nix)] ++ [(import ./nvim.nix)] ++ [(import ./zathura.nix)] ++ [(import ./packages.nix)] ++ [(import ./scripts/scripts.nix)] ++ [(import ./swaylock.nix)] ++ [(import ./waybar)] - ++ [(import ./wofi.nix)] ++ [(import ./zsh.nix)] ++ [(import ./tmux.nix)]; } From d994c9c721fce370c192f8420dbc2964a78b79e1 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 1 Mar 2025 22:28:31 +0100 Subject: [PATCH 17/17] feat: remove pkill for wallpaper-picker since it's not required anymore --- modules/home/hyprland/config.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 4f159f9..1e559df 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -221,7 +221,7 @@ "$mainMod, E, exec, thunar" "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped" "$mainMod, C ,exec, hyprpicker -a" - "$mainMod, W ,exec, pkill wofi || wallpaper-picker" + "$mainMod, W ,exec, wallpaper-picker" # clipboard manager "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy" @@ -326,9 +326,6 @@ "size 950 600,title:^(float_kitty)$" "float,audacious" "workspace 8 silent, audacious" - "pin,wofi" - "float,wofi" - "noborder,wofi" "tile, neovide" "idleinhibit focus,mpv" "float,udiskie"