feat: update flake.lock

flake.lock

@@ -89,11 +89,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1764873433,
+        "lastModified": 1775176642,
-        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
+        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
+        "rev": "179704030c5286c729b5b0522037d1d51341022c",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768135262,
+        "lastModified": 1775087534,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767609335,
+        "lastModified": 1775087534,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -235,20 +235,18 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "host": "gitlab.gnome.org",
         "lastModified": 1767737596,
         "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
         "owner": "GNOME",
         "repo": "gnome-shell",
         "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "gitlab"
+        "type": "github"
       },
       "original": {
-        "host": "gitlab.gnome.org",
         "owner": "GNOME",
-        "ref": "gnome-49",
         "repo": "gnome-shell",
-        "type": "gitlab"
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "github"
       }
     },
     "home-manager": {
@@ -258,11 +256,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769776025,
+        "lastModified": 1775457580,
-        "narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=",
+        "narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0",
+        "rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc",
         "type": "github"
       },
       "original": {
@@ -279,11 +277,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768434960,
+        "lastModified": 1774991950,
-        "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=",
+        "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b",
+        "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7",
         "type": "github"
       },
       "original": {
@@ -299,11 +297,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1769731486,
+        "lastModified": 1775427754,
-        "narHash": "sha256-FubWXQX1k1qyVKWiGNVSw2bQ2TD739PRqRsLXS/b2y0=",
+        "narHash": "sha256-+z5+5Wl63CTjlLzP3KbVBpNdEFndqKcb5IZJLY4FZnM=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "0d454d45604a3215057806757beda9bc7390d59e",
+        "rev": "df3f935c8c65f43614e01fdce92c332b3c7686c7",
         "type": "github"
       },
       "original": {
@@ -315,11 +313,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1769723720,
+        "lastModified": 1775340536,
-        "narHash": "sha256-gmlHBj1nGfOBaCMEfgHdy/4sbuBXDaVIWNGJVPP+vNw=",
+        "narHash": "sha256-AAeheDZMLpXuWe7txFp6DfDnwPCEC83Nkc2vLiLz8+4=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "52cd9dcff260decda860cf154873b298d10c1208",
+        "rev": "39335d6a7d8e097798b2e59bd53d25fa54456021",
         "type": "github"
       },
       "original": {
@@ -337,11 +335,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1769120060,
+        "lastModified": 1769821964,
-        "narHash": "sha256-tolMUwGXDZ7i6Vl2tUA2qpx2ElzgUNcmIHSRetCOlyU=",
+        "narHash": "sha256-WcfoLCZbo32Psw2mP9bF8uHCF50SMAhQFkWq+/+Z9B0=",
         "owner": "lunik1",
         "repo": "nix-wallpaper",
-        "rev": "6cac16b301d5cdfa299224182b8891c7fd31b437",
+        "rev": "f658947fdc9ab85be9003deb26632a464bd41e5d",
         "type": "github"
       },
       "original": {
@@ -352,11 +350,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769527094,
+        "lastModified": 1775126147,
-        "narHash": "sha256-xV20Alb7ZGN7qujnsi5lG1NckSUmpIb05H2Xar73TDc=",
+        "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "afce96367b2e37fc29afb5543573cd49db3357b7",
+        "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef",
         "type": "github"
       },
       "original": {
@@ -368,11 +366,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1769461804,
+        "lastModified": 1775036866,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
         "type": "github"
       },
       "original": {
@@ -394,11 +392,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767810917,
+        "lastModified": 1775228139,
-        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
+        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
+        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
         "type": "github"
       },
       "original": {
@@ -455,18 +453,17 @@
         ],
         "nur": "nur",
         "systems": "systems_2",
-        "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1769782950,
+        "lastModified": 1775429060,
-        "narHash": "sha256-bMJPPDyG/BV7Qx0r5JuO9oQG/o/VlnEOFnC8zKhJsBQ=",
+        "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "aad90ca763be126c0ed67c29826bbb9b5ca665d8",
+        "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019",
         "type": "github"
       },
       "original": {
@@ -505,23 +502,6 @@
         "type": "github"
       }
     },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
     "tinted-kitty": {
       "flake": false,
       "locked": {
@@ -541,11 +521,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1767710407,
+        "lastModified": 1772661346,
-        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
+        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
+        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
         "type": "github"
       },
       "original": {
@@ -557,11 +537,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1767489635,
+        "lastModified": 1772934010,
-        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
+        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
+        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
         "type": "github"
       },
       "original": {
@@ -573,11 +553,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1767488740,
+        "lastModified": 1772909925,
-        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
+        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
+        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
         "type": "github"
       },
       "original": {
@@ -594,11 +574,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769748063,
+        "lastModified": 1775453133,
-        "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=",
+        "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a",
+        "rev": "8d0508ffceba8ad785ae442591dd115080a55142",
         "type": "github"
       },
       "original": {

home/pc/common/home.nix

@@ -1,7 +1,6 @@
-{ inputs, pkgs, ... }:
+{ inputs, lib, pkgs, ... }:
 {
   imports = [
-    inputs.nixvim.homeModules.nixvim
     inputs.zen-browser.homeModules.default
 
     ./programs
@@ -10,12 +9,15 @@
     ./packages.nix
     ./xdg.nix
   ];
+
   home.username = "autumn";
   home.homeDirectory = "/home/autumn";
   home.stateVersion = "25.05";
 
-  programs.ghostty.enable = true;
+  programs.foot = {
-  programs.ghostty.settings.font-size = 24;
+    enable = true;
+    settings.main.font = lib.mkForce "Caskaydia Cove Mono:size=24";
+  };
 
   stylix = {
     targets.waybar.enable = false;
@@ -31,9 +33,20 @@
   };
 
   home.pointerCursor = {
-    name = "Adwaita";
+    name = "catppuccin-mocha-pink-cursors";
-    package = pkgs.adwaita-icon-theme;
+    package = pkgs.catppuccin-cursors.mochaPink;
-    size = 12;
+    size = 6;
+    x11.enable = true;
+    gtk.enable = true;
+  };
+
+  gtk = {
+    enable = true;
+    cursorTheme = {
+      name = "catppuccin-mocha-pink-cursors";
+      package = pkgs.catppuccin-cursors.mochaPink;
+      size = 6;
+    };
   };
 
   programs.home-manager.enable = true;

home/pc/common/packages.nix

@@ -1,32 +1,23 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    audacity
     bitwarden-desktop
-    cava
     cmus
-    fd
     file
     ffmpeg
     fzf
-    gimp3-with-plugins
+    jellyfin-desktop
-    grim
-    killall
     krita
     lazygit
-    libreoffice
+    lmms
-    libresprite
     man-pages
     man-pages-posix
     obs-studio
-    python3
+    projectm-sdl-cpp
     ripgrep
-    rusty-man
+    signal-desktop
-    slurp
     tor-browser
-    unzip
     vial
-    virtualboxKvm
     vlc
     wl-clipboard
     xdg-desktop-portal

home/pc/common/programs/default.nix

@@ -5,16 +5,16 @@
 
     ./btop.nix
     ./carapace.nix
-    ./fastfetch.nix
+    # ./fastfetch.nix
     ./fish.nix
     ./git.nix
-    ./hyfetch.nix
+    # ./hyfetch.nix
     ./mako.nix
-    ./ncspot.nix
+    # ./ncspot.nix
-    ./tmux.nix
+    # ./tmux.nix
     ./vesktop.nix
     ./waybar.nix
-    ./yazi.nix
+    # ./yazi.nix
     ./zathura.nix
     ./zen.nix
     ./zoxide.nix

home/pc/common/programs/fish.nix

@@ -4,24 +4,20 @@
     pkgs.nix-your-shell
     pkgs.lolcat
     pkgs.kittysay
-    pkgs.eza
   ];
 
   programs.fish = {
     enable = true;
     shellInit = ''
-      set -g fish_key_bindings fish_vi_key_bindings
-
       function fish_prompt
-        string join ' ' -- (set_color magenta) $(prompt_pwd) :3 (set_color normal)
+        if test -z $IN_NIX_SHELL
+          printf '%s%s λ %s' (set_color magenta) $(prompt_pwd) (set_color normal)
+        else
+          printf '%s%s%s [nix-shell %s]%s λ%s ' (set_color magenta) $(prompt_pwd) (set_color yellow) $IN_NIX_SHELL (set_color magenta) (set_color normal)
+        end
       end
 
       function fish_greeting
-        echo hii autumn :3\nthe time is $(date +%T) | kittysay | lolcat
-      end
-
-      function ls --description "List directory contents"
-        eza --icons=always $argv
       end
 
       function nix-shell --description "Start an interactive shell based on a Nix expression"

home/pc/common/programs/zoxide.nix

@@ -1,7 +1,7 @@
 {...}:
 {
   programs.zoxide = {
-    enable = true;
+    enable = false;
     enableFishIntegration = true;
   };
 }

host/pc/common/configuration.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   hostName,
   pkgs,
@@ -16,6 +17,16 @@
     ./dwl/dwl.nix
   ];
 
+  environment.etc."current-system-packages".text =
+    let
+      packages = map (p: "${p.name}") config.environment.systemPackages;
+      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
+      formatted = builtins.concatStringsSep "\n" sortedUnique;
+    in
+    formatted;
+
+  services.flatpak.enable = true;
+
   boot.loader.efi.canTouchEfiVariables = true;
   boot.tmp.cleanOnBoot = true;
 
@@ -45,8 +56,18 @@
     };
   };
 
+  environment.etc."current-home-manager-packages".text =
+    let
+      packages = map (p: "${p.name}") config.home-manager.users.${userName}.home.packages;
+      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
+      formatted = builtins.concatStringsSep "\n" sortedUnique;
+    in
+    formatted;
+
   services.gnome.glib-networking.enable = true;
 
+  #services.desktopManager.plasma6.enable = true;
+
   services.displayManager.ly = {
     enable = true;
   };
@@ -108,21 +129,13 @@
     "flakes"
   ];
 
-  programs.dconf.enable = true;
-
   environment.systemPackages = with pkgs; [
     cloudflared
     gparted
     networkmanagerapplet
     nh
     pavucontrol
-    (pkgs.catppuccin-sddm.override {
-      flavor = "mocha";
-      font = "CaskaydiaCove Nerd Font";
-      fontSize = "12";
-    })
     wget
-    ntfs3g
   ];
 
   fonts = {
@@ -148,6 +161,7 @@
     SUDO_EDITOR = "nvim";
     BROWSER = "zen";
     SHELL = "fish";
+    TERM = "foot";
   };
 
   system.stateVersion = "24.05";

host/pc/common/dwl/config.h

@@ -105,9 +105,9 @@ static const char *const autostart[] = {
     // Set the resolution
     "wlr-randr", "--output", "DP-2", "--mode", "2560x1440@180Hz", NULL,
     // Start the wallpaper daemon
-    "swww-daemon", NULL,
+    "awww-daemon", NULL,
     // Include the wallpaper
-    "swww", "img", WALLPAPER, "-t", "none", NULL,
+    "awww", "img", WALLPAPER, "-t", "none", NULL,
     // Start waybar
     "waybar", NULL,
     // Needed for screencasting
@@ -183,7 +183,7 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *termcmd[] = { "ghostty", NULL };
+static const char *termcmd[] = { "foot", NULL };
 static const char *menucmd[] = { "rofi", "-show", "drun", NULL };
 static const char *powrcmd[] = { "rofi", "-show", "pm", "-modi", "pm:rofi-power-menu", "--choices", "suspend/reboot/shutdown", NULL };
 static const char *emjicmd[] = { "rofimoji", "--action", "copy", NULL };

host/pc/common/dwl/dwl.nix

@@ -3,7 +3,7 @@
   environment.systemPackages = [
     pkgs.gscreenshot
     pkgs.wlr-randr
-    pkgs.swww
+    pkgs.awww
   ];
   programs.dwl = {
     enable = true;