dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit a85431844b0069c88f5d2b86a5e0000b026aee36 parent 811295ea46302320034afb612701aa906049d1b3 Author: maydayv7 <maydayv7@gmail.com> Date: Fri, 4 Jul 2025 22:58:00 +0530 chore: Update `inputs` Also improve `nix apply --delta` Flake lock file changes: • Updated input 'catppuccin': 'github:catppuccin/nix/3a42cd79c647360ee8742659e42aeec0947dd3b4?narHash=sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY%3D' (2025-06-06) → 'github:catppuccin/nix/09e2be240370f27312a44633d852732b66cb8f01?narHash=sha256-07ZP0hEF7HVqGdDc7hgP3jOduNznFt71Lqb3xgXXQWI%3D' (2025-07-04) • Updated input 'gaming': 'github:fufexan/nix-gaming/f8a59c94a4f7d3a391d8a610a2ee193f3c1f054e?narHash=sha256-afNx5noWUau9ut6GHchz26HZvfw87zU8vZTnaR3O16M%3D' (2025-06-06) → 'github:fufexan/nix-gaming/d00203f8630983aadb57cfde60b481cd97d06659?narHash=sha256-IXBLUCMTKaMzbbs5SOqH7FEI9fRwOi3ZP6LKjttnO5o%3D' (2025-07-03) • Updated input 'gaming/nixpkgs': 'github:NixOS/nixpkgs/59138c7667b7970d205d6a05a8bfa2d78caa3643?narHash=sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es%3D' (2025-05-31) → 'github:NixOS/nixpkgs/80d50fc87924c2a0d346372d242c27973cf8cdbf?narHash=sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM%3D' (2025-06-27) • Updated input 'framework': 'github:hercules-ci/flake-parts/49f0870db23e8c1ca0b5259734a02cd9e1e371a1?narHash=sha256-F82%2BgS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE%3D' (2025-06-01) → 'github:hercules-ci/flake-parts/77826244401ea9de6e3bac47c2db46005e1f30b5?narHash=sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ%3D' (2025-07-01) • Updated input 'formatter': 'github:numtide/treefmt-nix/a05be418a1af1198ca0f63facb13c985db4cb3c5?narHash=sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk%3D' (2025-06-06) → 'github:numtide/treefmt-nix/ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1?narHash=sha256-0IEdQB1nS%2BuViQw4k3VGUXntjkDp7aAlqcxdewb/hAc%3D' (2025-06-26) • Updated input 'hardware': 'github:NixOS/nixos-hardware/4602f7e1d3f197b3cb540d5accf5669121629628?narHash=sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM%3D' (2025-06-06) → 'github:NixOS/nixos-hardware/497ae1357f1ac97f1aea31a4cb74ad0d534ef41f?narHash=sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE%2BJ9w%3D' (2025-07-02) • Updated input 'home': 'github:nix-community/home-manager/7aae0ee71a17b19708b93b3ed448a1a0952bf111?narHash=sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg%3D' (2025-06-05) → 'github:nix-community/home-manager/501cfec8277f931a9c9af9f23d3105c537faeafe?narHash=sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA%3D' (2025-07-02) • Updated input 'index': 'github:Mic92/nix-index-database/2860bee699248d828c2ed9097a1cd82c2f991b43?narHash=sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs%3D' (2025-06-01) → 'github:Mic92/nix-index-database/9c932ae632d6b5150515e5749b198c175d8565db?narHash=sha256-3EKpUmyGmHYA/RuhZjINTZPU%2BOFWko0eDwazUOW64nw%3D' (2025-06-29) • Updated input 'nixcord': 'github:kaylorben/nixcord/2d402f68abbf9ac54bb34fff25fab99b4b566f3e?narHash=sha256-LIT2vl6nL0e440AVSTwzMphr1pwsgu%2Btg0hMSA6FfwQ%3D' (2025-06-06) → 'github:kaylorben/nixcord/53ee7e4bd8cf17d055fcb89eea7465f0d96aca9b?narHash=sha256-yntDCqXzrfMzUkzvwPjCyK1AfKwkBXyVeXItmBRHAUo%3D' (2025-07-04) • Updated input 'spotify': 'github:Gerg-L/spicetify-nix/0e03de40d5128eb2ad600c98f57cf5db2cdf3240?narHash=sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o%3D' (2025-06-01) → 'github:Gerg-L/spicetify-nix/16adc163d966fc2bb5da47580df4602ae2c7a310?narHash=sha256-SeVvQm9ex%2B6BhDPIsRt9E1kSmMblQ6gTi53baphnX08%3D' (2025-06-29) • Updated input 'vscode': 'github:nix-community/nix-vscode-extensions/832bd4f14d5a64df323b456132c33c572e7f0c75?narHash=sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok%3D' (2025-06-06) → 'github:nix-community/nix-vscode-extensions/e3a859385648ba529eacc2efe61d529eef6f5485?narHash=sha256-R6ZonDO1yldt3KUDi%2Bu8irXo09%2BEjisiqK4s7Je46B4%3D' (2025-07-02) • Updated input 'waypkgs': 'github:nix-community/nixpkgs-wayland/60e0443c3367f4b45ea50f2e0cfa6c33c997d87e?narHash=sha256-hRvzcTaA46cKSkfAnhB38qab2shUBfXDg8VnCQNpx2Q%3D' (2025-06-11) → 'github:nix-community/nixpkgs-wayland/d9c1dddd06a98061ae00efe67f0c00be33976efa?narHash=sha256-U8HLLdHUbtZimmrs8bOyHdeAK%2BTUp4CFD7iPSD8RyXU%3D' (2025-07-04) • Updated input 'waypkgs/lib-aggregate': 'github:nix-community/lib-aggregate/ec6842bc742938f5f16608661cc4a1810fc177d3?narHash=sha256-xWsaXDt1kV2NtvMuS%2BRd62jqrWGgkFDeiRIa5yQRgGA%3D' (2025-06-08) → 'github:nix-community/lib-aggregate/03847f95c54ddc6fe0628568b1c8fab43b3cff60?narHash=sha256-MSQbJd3hSogr6Xu55wsDIaA7GFZfG9Im7bCmoLmrcfo%3D' (2025-06-29) • Updated input 'waypkgs/lib-aggregate/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/2a3d74c76852805ec8eba6dd52350e85e75805ec?narHash=sha256-w2J8aeSsMT6v6xAokr076vSCDHs5LRi2JkTUyNsEl4o%3D' (2025-06-08) → 'github:nix-community/nixpkgs.lib/14a40a1d7fb9afa4739275ac642ed7301a9ba1ab?narHash=sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo%3D' (2025-06-29) • Updated input 'waypkgs/nixpkgs': 'github:nixos/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f?narHash=sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU%3D' (2025-06-07) → 'github:nixos/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df?narHash=sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU%2Btt4YY%3D' (2025-06-30) • Updated input 'windows': 'github:emmanuelrosa/erosanix/476eccfde0dae1c439915ff45c59a9e160ef14c4?narHash=sha256-4BMn5b1YCd2ahtRs0Lx8U4qBDgzDcRqNcW5NsgrP650%3D' (2025-06-05) → 'github:emmanuelrosa/erosanix/ef4a55c91867ee3c44e990fea0ceffb3baf9c06d?narHash=sha256-A/T3oLaia1qy1dBmR9R8wfooqt6Az6RWz3EzSYcMo5I%3D' (2025-07-03) • Updated input 'stable': 'github:NixOS/nixpkgs/4792576cb003c994bd7cc1edada3129def20b27d?narHash=sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU%3D' (2025-06-05) → 'github:NixOS/nixpkgs/34627c90f062da515ea358360f448da57769236e?narHash=sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU%3D' (2025-07-02) • Updated input 'unstable': 'github:NixOS/nixpkgs/c2a03962b8e24e669fb37b7df10e7c79531ff1a4?narHash=sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj%2BQ%3D' (2025-06-03) → 'github:NixOS/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df?narHash=sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU%2Btt4YY%3D' (2025-06-30)
Diffstat:
| M | CHANGELOG.md | | | 1 | + |
| M | devices/valkyrie/default.nix | | | 2 | +- |
| D | devices/valkyrie/mc-server.nix | | | 28 | ---------------------------- |
| A | devices/valkyrie/minecraft.nix | | | 29 | +++++++++++++++++++++++++++++ |
| M | flake.lock | | | 108 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | modules/gui/desktop/hyprland/apps/misc.nix | | | 21 | +++++++++------------ |
| M | modules/gui/desktop/hyprland/apps/panel.nix | | | 2 | +- |
| M | modules/nix/tools.nix | | | 1 | + |
| M | scripts/commands.sh | | | 6 | +++--- |
| M | scripts/install.nix | | | 6 | +++--- |
| M | scripts/mail.sh | | | 6 | +++--- |
| M | scripts/nixos.nix | | | 33 | +++++++++++++++++++++------------ |
12 files changed, 126 insertions(+), 117 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -2,6 +2,7 @@ ### July +- Improve `nixos apply --delta` - Add Minecraft Server Configuration - Update GNOME Extensions diff --git a/devices/valkyrie/default.nix b/devices/valkyrie/default.nix @@ -14,7 +14,7 @@ imports = [ ./drivers.nix - ./mc-server.nix + ./minecraft.nix ]; hardware = { diff --git a/devices/valkyrie/mc-server.nix b/devices/valkyrie/mc-server.nix @@ -1,28 +0,0 @@ -{ config, ... }: -{ - ## Minecraft Server - specialisation.mc-server.configuration = { - apps = { - games = [ "mc-server" ]; - mc-server = { - memory = 16; - config = { - motd = "My World"; - gamemode = "survival"; - difficulty = "normal"; - online-mode = false; - server-port = 25565; - server-ip = "0.0.0.0"; - }; - }; - }; - - # VPN Tunnel - environment.persist.directories = [ "/var/lib/tailscale" ]; - services.tailscale = { - enable = true; - openFirewall = true; - authKeyFile = config.sops.secrets."tailscale.secret".path; - }; - }; -} diff --git a/devices/valkyrie/minecraft.nix b/devices/valkyrie/minecraft.nix @@ -0,0 +1,29 @@ +{ config, ... }: +{ + ## Minecraft Server + specialisation.minecraft.configuration = { + system.nixos.label = "special.minecraft"; + apps = { + games = [ "mc-server" ]; + mc-server = { + memory = 16; + config = { + motd = "My World"; + gamemode = "survival"; + difficulty = "normal"; + online-mode = false; + server-port = 25565; + server-ip = "0.0.0.0"; + }; + }; + }; + + # VPN Tunnel + environment.persist.directories = [ "/var/lib/tailscale" ]; + services.tailscale = { + enable = true; + openFirewall = true; + authKeyFile = config.sops.secrets."tailscale.secret".path; + }; + }; +} diff --git a/flake.lock b/flake.lock @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1749223974, - "narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=", + "lastModified": 1751636951, + "narHash": "sha256-07ZP0hEF7HVqGdDc7hgP3jOduNznFt71Lqb3xgXXQWI=", "owner": "catppuccin", "repo": "nix", - "rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4", + "rev": "09e2be240370f27312a44633d852732b66cb8f01", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749175147, - "narHash": "sha256-afNx5noWUau9ut6GHchz26HZvfw87zU8vZTnaR3O16M=", + "lastModified": 1751508010, + "narHash": "sha256-IXBLUCMTKaMzbbs5SOqH7FEI9fRwOi3ZP6LKjttnO5o=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f8a59c94a4f7d3a391d8a610a2ee193f3c1f054e", + "rev": "d00203f8630983aadb57cfde60b481cd97d06659", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -559,11 +559,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "type": "github" }, "original": { @@ -982,11 +982,11 @@ ] }, "locked": { - "lastModified": 1748751003, - "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749384866, - "narHash": "sha256-xWsaXDt1kV2NtvMuS+Rd62jqrWGgkFDeiRIa5yQRgGA=", + "lastModified": 1751199295, + "narHash": "sha256-MSQbJd3hSogr6Xu55wsDIaA7GFZfG9Im7bCmoLmrcfo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "ec6842bc742938f5f16608661cc4a1810fc177d3", + "rev": "03847f95c54ddc6fe0628568b1c8fab43b3cff60", "type": "github" }, "original": { @@ -1049,11 +1049,11 @@ ] }, "locked": { - "lastModified": 1749174675, - "narHash": "sha256-LIT2vl6nL0e440AVSTwzMphr1pwsgu+tg0hMSA6FfwQ=", + "lastModified": 1751592500, + "narHash": "sha256-yntDCqXzrfMzUkzvwPjCyK1AfKwkBXyVeXItmBRHAUo=", "owner": "kaylorben", "repo": "nixcord", - "rev": "2d402f68abbf9ac54bb34fff25fab99b4b566f3e", + "rev": "53ee7e4bd8cf17d055fcb89eea7465f0d96aca9b", "type": "github" }, "original": { @@ -1064,11 +1064,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748662220, - "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", + "lastModified": 1750994206, + "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", "type": "github" }, "original": { @@ -1080,11 +1080,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1749345370, - "narHash": "sha256-w2J8aeSsMT6v6xAokr076vSCDHs5LRi2JkTUyNsEl4o=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2a3d74c76852805ec8eba6dd52350e85e75805ec", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -1111,11 +1111,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1311,11 +1311,11 @@ ] }, "locked": { - "lastModified": 1748752728, - "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=", + "lastModified": 1751171964, + "narHash": "sha256-SeVvQm9ex+6BhDPIsRt9E1kSmMblQ6gTi53baphnX08=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240", + "rev": "16adc163d966fc2bb5da47580df4602ae2c7a310", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ }, "stable": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1751479989, + "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "34627c90f062da515ea358360f448da57769236e", "type": "github" }, "original": { @@ -1556,11 +1556,11 @@ }, "unstable": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -1618,11 +1618,11 @@ ] }, "locked": { - "lastModified": 1749175351, - "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=", + "lastModified": 1751422033, + "narHash": "sha256-R6ZonDO1yldt3KUDi+u8irXo09+EjisiqK4s7Je46B4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75", + "rev": "e3a859385648ba529eacc2efe61d529eef6f5485", "type": "github" }, "original": { @@ -1638,11 +1638,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749648849, - "narHash": "sha256-hRvzcTaA46cKSkfAnhB38qab2shUBfXDg8VnCQNpx2Q=", + "lastModified": 1751597660, + "narHash": "sha256-U8HLLdHUbtZimmrs8bOyHdeAK+TUp4CFD7iPSD8RyXU=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "60e0443c3367f4b45ea50f2e0cfa6c33c997d87e", + "rev": "d9c1dddd06a98061ae00efe67f0c00be33976efa", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1749151378, - "narHash": "sha256-4BMn5b1YCd2ahtRs0Lx8U4qBDgzDcRqNcW5NsgrP650=", + "lastModified": 1751580719, + "narHash": "sha256-A/T3oLaia1qy1dBmR9R8wfooqt6Az6RWz3EzSYcMo5I=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "476eccfde0dae1c439915ff45c59a9e160ef14c4", + "rev": "ef4a55c91867ee3c44e990fea0ceffb3baf9c06d", "type": "github" }, "original": { diff --git a/modules/gui/desktop/hyprland/apps/misc.nix b/modules/gui/desktop/hyprland/apps/misc.nix @@ -27,22 +27,19 @@ in catppuccin = with theme; { inherit accent; flavor = variant; - vscode.enable = true; + thunderbird.enable = true; + vesktop.enable = true; + vscode.enable = true; }; - programs = with theme; { - # Code Editor - vscode.profiles.default = mkIf (exists "vscode") { - extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc-icons ]; - userSettings = { - "workbench.iconTheme" = "${name}-${variant}"; - "terminal.external.linuxExec" = "kitty"; - }; + # Code Editor + programs.vscode.profiles.default = mkIf (exists "vscode") { + extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc-icons ]; + userSettings = { + "workbench.iconTheme" = with theme; "${name}-${variant}"; + "terminal.external.linuxExec" = "kitty"; }; - - # Discord Chat - nixcord.quickCss = mkIf (exists "discord") ''@import url("https://${name}.github.io/discord/dist/${name}-${variant}-${accent}.theme.css");''; }; # KDE Apps diff --git a/modules/gui/desktop/hyprland/apps/panel.nix b/modules/gui/desktop/hyprland/apps/panel.nix @@ -21,7 +21,7 @@ in programs.waybar = { enable = true; systemd.enable = true; - package = pkgs.waypkgs.waybar; + package = pkgs.unstable.waybar; style = files.hyprland.waybar; # Panel diff --git a/modules/nix/tools.nix b/modules/nix/tools.nix @@ -19,6 +19,7 @@ environment.systemPackages = with pkgs; [ cachix manix + nix-output-monitor nixfmt-rfc-style nodePackages.prettier shellcheck diff --git a/scripts/commands.sh b/scripts/commands.sh @@ -5,8 +5,8 @@ temp(){ TEMP=/tmp/"$1" - if ! [ "$2" -eq 1 ]; then rm -rf "$TEMP"; fi - mkdir -p "$TEMP" + if [ "$2" != "1" ]; then rm -rf "$TEMP"; fi + if [ "$2" != "2" ]; then mkdir -p "$TEMP"; fi } extract() { @@ -50,7 +50,7 @@ internet() { } restart() { - read -rp "Do you want to Reboot the System? (Y/N): " choice + read -rp "Do you want to Reboot the System? (Y/*): " choice case $choice in [Yy]*) reboot;; *) exit;; diff --git a/scripts/install.nix b/scripts/install.nix @@ -129,7 +129,7 @@ recursiveUpdate fi warn "Disk will be Completely Wiped for Automatic Partitioning" - read -rp "Do you want to Automatically Create the Partitions? (Y/N): " choice + read -rp "Do you want to Automatically Create the Partitions? (Y/*): " choice case $choice in [Yy]*) partition_disk;; *) warn "You must Create, Format and Label the Partitions on your own"; gparted &> /dev/null;; @@ -138,14 +138,14 @@ recursiveUpdate read -rp "Select Filesystem to use for Disk (simple/advanced): " choice case $choice in 1|[Ss]*) - read -rp "Do you want to Create and Format the EXT4 Partitions? (Y/N): " choice + read -rp "Do you want to Create and Format the EXT4 Partitions? (Y/*): " choice case $choice in [Yy]*) create_ext4; mount_ext4;; *) warn "Assuming that Required EXT4 Partition has already been Created"; mount_ext4;; esac ;; 2|[Aa]*) - read -rp "Do you want to Create the ZFS Pool and Datasets? (Y/N): " choice + read -rp "Do you want to Create the ZFS Pool and Datasets? (Y/*): " choice case $choice in [Yy]*) create_zfs; mount_zfs;; *) warn "Assuming that Required ZFS Pool and Datasets have already been Created"; mount_zfs;; diff --git a/scripts/mail.sh b/scripts/mail.sh @@ -13,15 +13,15 @@ find "$MAIL" -type d -mindepth 1 | tac | xargs -d '\n' -I{} mv {} {}.sbd find "$MAIL" -name mbox -type f | xargs -d '\n' -I{} echo '"{}" "{}"' | sed -e 's/\.sbd\/mbox"$/"/' | xargs -L 1 mv find "$MAIL" -empty -type d | xargs -d '\n' rmdir find "$MAIL" -type d | grep -E '.sbd' | sed 's/.\{4\}$//' | xargs -d '\n' touch -echo "Conversion Complete, Files are Present in $MAIL" +echo "Conversion complete, files are present in $MAIL" # Mail Import import() { -read -rp "Enter Name of Thunderbird Profile: " PROFILE +read -rp "Enter name of Thunderbird Profile: " PROFILE cp -r "$MAIL"/. "$HOME/.thunderbird/$PROFILE/Mail/Local Folders/Converted/" && echo "Successfully Imported" } -read -rp "Do you want to Import the Mails into Thunderbird? (Y/N): " choice +read -rp "Do you want to import the Mails into Thunderbird? (Y/*): " choice case $choice in [Yy]*) import; rm -rf "$MAIL";; *) rm -rf "$MAIL"; exit;; diff --git a/scripts/nixos.nix b/scripts/nixos.nix @@ -90,19 +90,21 @@ recursiveUpdate pkgs.writeShellApplication { name = "nixos"; runtimeInputs = with pkgs; [ - cachix coreutils - git gnugrep - gnupg gnused + git jq - manix - nixFlakes - nvd - sops tree + gnupg + sops wine.mkwindowsapp-tools + + nixFlakes + cachix + manix + nix-output-monitor + nvd ]; text = '' @@ -159,17 +161,24 @@ recursiveUpdate fi ;; "--delta") - temp nixos-build - pushd "$TEMP" &> /dev/null echo "Building Configuration..." - if nixos-rebuild build --flake ${path.system}# + temp nixos-build 2 + HOSTNAME=$(cat /etc/hostname) + if nom build ${path.system}#nixosConfigurations."$HOSTNAME".config.system.build.toplevel --out-link "$TEMP" then echo "Processing Delta..." - nvd diff /run/current-system result + nvd diff /run/current-system "$TEMP" + read -rp "Do you want to apply the configuration? (Y/*): " choice + case $choice in + [Yy]*) + echo "Applying Configuration..." + sudo "$TEMP"/bin/switch-to-configuration switch + ;; + *) exit;; + esac else error "Couldn't build generation successfully" fi - popd &> /dev/null ;; "--test") echo "Testing Configuration..."