diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 63622bf..295a5b1 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1728392601, - "narHash": "sha256-0ZuowheyMfLuxr4ViAWiKjs0aow1pn8xtKlsYx+NVR4=", + "lastModified": 1728518869, + "narHash": "sha256-E3UDvOmDuADBDxJIzPKiUmKC2CLoVvWP+9gjlw5xS8Y=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "147c0997fe3451b09fa30c47afa1577f91aa7524", + "rev": "8bfc88598cfc49588de18099d7962c623cb86310", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1728196311, - "narHash": "sha256-JoDDlmjPj0sGo1beOo3bRh7BDppm0Kuet7I7BqTmSl4=", + "lastModified": 1728455642, + "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", "owner": "nix-community", "repo": "fenix", - "rev": "26971356e387b5ec0578f52be1bbd82ecf6dbad4", + "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1728183036, - "narHash": "sha256-aq8i8LCbbo2gIBcFiMTFxyE4fdAKrjFU1c//zZn0bZM=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "751641e82a34709ed2a177e69e23b1ea08a75561", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1728064742, - "narHash": "sha256-tFvUGvqUZjES1yxYT2zEFiTAE0iQKYd+eWKX/6ZqeVw=", + "lastModified": 1728386838, + "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5982d9c420d0dc90739171829f0d2e9c80d98979", + "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7b3803d..8eaaec4 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1728461096, - "narHash": "sha256-cd0cXB85B3kGpm+iumP9xCnqFErspXL9Z/2X59kQ6c4=", + "lastModified": 1728527353, + "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e310b9bd71fa6c6a9fec0a8cf5af43ce798a0ad6", + "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac", "type": "github" }, "original": { diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 5979b29..9668a8c 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -2,7 +2,7 @@ let eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; cargo = "${pkgs.cargo}/bin/cargo"; - coreutil = "${pkgs.coreutils}/bin"; + coreutils = "${pkgs.coreutils}/bin"; in { programs.fish = { @@ -13,7 +13,7 @@ in set fish_greeting #fixes gnupg password entry - export GPG_TTY=(${coreutil}/tty) + export GPG_TTY=(${coreutils}/tty) #pfetch on shell start (disable pkgs because of execution time) PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch @@ -38,11 +38,11 @@ in ${pkgs.git}/bin/git rev-list --objects --all | ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | ${pkgs.gnused}/bin/sed -n 's/^blob //p' | - ${coreutil}/sort --numeric-sort --key=2 | - ${coreutil}/cut -c 1-12,41- | - ${coreutil}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; + ${coreutils}/sort --numeric-sort --key=2 | + ${coreutils}/cut -c 1-12,41- | + ${coreutils}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; - #aliases for (I think) macos commands + # aliases for (I think) macos commands pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix index 4b6f271..6dd51cb 100644 --- a/home-manager/progs/helix.nix +++ b/home-manager/progs/helix.nix @@ -16,7 +16,7 @@ hidden = false; }; - #wrapping!! + # wrapping!! soft-wrap.enable = true; }; }; @@ -31,7 +31,7 @@ }; themes = { - #modified fleet_dark theme + # modified fleet_dark theme my_theme = let white = "#ffffff"; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index a6aa705..2acc71a 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -7,10 +7,10 @@ prefer-no-csd = true; spawn-at-startup = [ - #waybar + # waybar { command = [ "${pkgs.waybar}/bin/waybar" ]; } - #swaybg works on more than just sway (sets a wallpaper) + # swaybg works on more than just sway (sets a wallpaper) { command = [ "${pkgs.swaybg}/bin/swaybg" @@ -36,25 +36,25 @@ ]; binds = with config.lib.niri.actions; { - #application launcher + # application launcher "Mod+Space".action = spawn [ "${pkgs.rofi-wayland}/bin/rofi" "-show" "combi" ]; - #open a terminal + # open a terminal "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; - #lock the screen + # lock the screen "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; - #screenshotting + # screenshotting "Print".action = screenshot; "Ctrl+Print".action = screenshot-screen; "Alt+Print".action = screenshot-window; - #Volume control + # Volume control "XF86AudioRaiseVolume".action = spawn [ "${pkgs.avizo}/bin/volumectl" "-u" @@ -85,12 +85,12 @@ "down" ]; - #Force close a window + # Force close a window "Mod+Q".action = close-window; "Mod+Shift+Q".action = quit; - #bindings for like window management ig + # bindings for like window management ig "Mod+Left".action = focus-column-left; "Mod+Down".action = focus-window-down; diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index c9ba7fd..08c9efa 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -13,22 +13,22 @@ intel-gpu-tools swaylock - #manage bluetooth devices + # manage bluetooth devices blueman niri ]; - #bluetooth manager + # bluetooth manager services.blueman-applet.enable = true; - #notification daemon + # notification daemon services.dunst = { enable = true; package = pkgs.dunst; }; - #window manager + # window manager programs.niri = { settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; }; @@ -38,10 +38,10 @@ settings = import ./progs/swaylock.nix; }; - #waybar for status bar + # waybar for status bar programs.waybar = import ./progs/waybar.nix { inherit pkgs; }; - #rofi for application launcher + # rofi for application launcher programs.rofi = { enable = true; package = pkgs.rofi-wayland; @@ -56,7 +56,7 @@ path = "${homeDirectory}/.secrets/borg_bak_pass"; }; - #backup utility + # backup utility programs.borgmatic = { enable = true; package = pkgs.borgmatic;