chore: update flake lock

mod: fix fish_greeting
2026-10-25 07:04:48 +00:00 · 2026-10-19 00:52:55 -04:00 · 2026-10-18 19:38:14 +00:00 · 2026-10-18 07:01:16 +00:00 · 2026-10-17 20:32:59 -05:00 · 2026-10-17 20:02:48 -05:00
8 changed files with 96 additions and 279 deletions
@@ -9,11 +9,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1789138122,
-        "narHash": "sha256-mh+ZiGCtHAo0xIi1yaNjHsftfnlWz9JiYwHCyT16yIE=",
+        "lastModified": 1792853286,
+        "narHash": "sha256-l/Oh5k1NQqQuwh4gBF3VcmCF0WGiCT/LqfvY5huhOq4=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "d82d6d6f66caf4b63fb154e62fad83c627874127",
+        "rev": "e9a3b8fdb50a7d77a90c02c84e298c286310385b",
        "type": "github"
      },
      "original": {
@@ -32,11 +32,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1789888081,
-        "narHash": "sha256-GHz8B3/syibtGpMv344Qe61CRo2lZ7iN2V2hoT7MNRA=",
+        "lastModified": 1791702392,
+        "narHash": "sha256-8uWZP3UiJBtYzBzazI18WvlshKYHxPb+8aqm02OxL5M=",
        "ref": "refs/heads/master",
-        "rev": "d5a38bbc14a79967e3535c3e0951f53d9bf01800",
-        "revCount": 25,
+        "rev": "ee2a27ad749d6d774e26c2be5de5f3a5ecd4a93f",
+        "revCount": 28,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
      },
@@ -52,11 +52,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783744694,
-        "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
+        "lastModified": 1792800221,
+        "narHash": "sha256-53jIZEWNh96irEXhsMZFoNhLJgGSU3nYl1i4wFQHAsU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74",
+        "rev": "d31953cf55f9027a56e9be938daf5db8c5655663",
        "type": "github"
      },
      "original": {
@@ -267,11 +267,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1790312761,
-        "narHash": "sha256-Ie5wLHV8N17r8EALzfAsY1Bec6M7gIl+v+FbBmazpkQ=",
+        "lastModified": 1792644631,
+        "narHash": "sha256-3aILZu5bQ+6khPvGCdIbC7wBFZOgPbpP0TBSL9tf89E=",
        "owner": "purpleclay",
        "repo": "go-overlay",
-        "rev": "602e108a3c17113c7a19983ff8c9b88a4ab935b6",
+        "rev": "ff2b494b477eb4349dd40f0564cedab552f9804d",
        "type": "github"
      },
      "original": {
@@ -290,11 +290,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1790312761,
-        "narHash": "sha256-Ie5wLHV8N17r8EALzfAsY1Bec6M7gIl+v+FbBmazpkQ=",
+        "lastModified": 1792166485,
+        "narHash": "sha256-TL2RJ56FbBQNi6vsCXAn7QhZECh5DPbvzfiX6v+4r1A=",
        "owner": "purpleclay",
        "repo": "go-overlay",
-        "rev": "602e108a3c17113c7a19983ff8c9b88a4ab935b6",
+        "rev": "5971ffb6c5de960d37f3b85c53cb5a30387cd05a",
        "type": "github"
      },
      "original": {
@@ -313,11 +313,11 @@
        "rust-overlay": "rust-overlay_3"
      },
      "locked": {
-        "lastModified": 1789887932,
-        "narHash": "sha256-ryX9MgESeWwjpFMgxlaF97FgtaRyfIELgFLEeUR8xLQ=",
+        "lastModified": 1791702441,
+        "narHash": "sha256-qHf8tVIYu6OE1PKcthmpBgblg27u3bU7v4TVqy0B3jg=",
        "ref": "refs/heads/master",
-        "rev": "70288a728cc39eb5f390f71ae24d4a58763216b1",
-        "revCount": 14,
+        "rev": "2c2e99f6347e9be744a72f7df6043015989d6cd7",
+        "revCount": 17,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
      },
@@ -333,11 +333,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1790215976,
-        "narHash": "sha256-VkR1rMGyjU9jtw8ISFx5uqR9e+LEaOlhHwrseFkiIVk=",
+        "lastModified": 1792818383,
+        "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a6631107a83ceab5872f298a2ea710859c80c4cb",
+        "rev": "24f2190587513b9c2f73db112a17844ae912d965",
        "type": "github"
      },
      "original": {
@@ -355,11 +355,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1790365885,
-        "narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=",
+        "lastModified": 1792098797,
+        "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b",
+        "rev": "640725978b99076e18e069f6e7d2959124584f8f",
        "type": "github"
      },
      "original": {
@@ -417,11 +417,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1790450978,
-        "narHash": "sha256-/eLCD/X9kaWJqPR47+fDozEC87Hjmm3i8gJbYmDAD7g=",
+        "lastModified": 1792615934,
+        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5e2305d577ca00acbba631b05cb1094d172b29f3",
+        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
        "type": "github"
      },
      "original": {
@@ -433,11 +433,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1790450978,
-        "narHash": "sha256-/eLCD/X9kaWJqPR47+fDozEC87Hjmm3i8gJbYmDAD7g=",
+        "lastModified": 1792030654,
+        "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5e2305d577ca00acbba631b05cb1094d172b29f3",
+        "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8",
        "type": "github"
      },
      "original": {
@@ -487,11 +487,11 @@
        "rust-overlay": "rust-overlay_4"
      },
      "locked": {
-        "lastModified": 1790492743,
-        "narHash": "sha256-z9zSi95pcqk2zmjq5XKw2kSAAiCLcAM3hxH8EukGKTw=",
+        "lastModified": 1792639431,
+        "narHash": "sha256-ZFh9vzagl6LegBH4gjIvEWIvNuZGEqOQX0LiAwt9DA8=",
        "ref": "refs/heads/master",
-        "rev": "b1f009b0b557c4178600bc18fd495f0a8d54c35e",
-        "revCount": 103,
+        "rev": "ce646a959820bed061d173e7631cd13d39edd532",
+        "revCount": 118,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
      },
@@ -507,11 +507,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1790221470,
-        "narHash": "sha256-TzyWd4i7YCpqoF9xB8mfgDJ2sviAZysKH9R8YbQGjqA=",
+        "lastModified": 1792889789,
+        "narHash": "sha256-xpH3z+T5NELixXRjxGJ3mx30kz63Xt2B0ZfPWl7hcUg=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "95afe7a794216f53e217c5148c6fbe0b668192cf",
+        "rev": "557d2eb05a76e5939e6a75351343cae5731a71f8",
        "type": "github"
      },
      "original": {
@@ -563,11 +563,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1789802016,
-        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "lastModified": 1791620365,
+        "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
        "type": "github"
      },
      "original": {
@@ -585,11 +585,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1789802016,
-        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "lastModified": 1791620365,
+        "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
        "type": "github"
      },
      "original": {
@@ -606,11 +606,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1790407471,
-        "narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
+        "lastModified": 1792219666,
+        "narHash": "sha256-RMO08tKD+hFIL5ryWi85VY4aHE5oIpdV1h4kVFctOkw=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
+        "rev": "a110337465cfb76e3806b81b9db3094c3e6e770a",
        "type": "github"
      },
      "original": {
@@ -624,11 +624,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1790407471,
-        "narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
+        "lastModified": 1792825530,
+        "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
+        "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
        "type": "github"
      },
      "original": {
@@ -1,6 +1,7 @@
 { lib
 , pkgs
 , userName
+, isNixOS ? true
 , ...
 }: let
  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -30,6 +31,19 @@ in
      stateVersion = "24.11";
    }

+    (lib.mkIf isNixOS {
+      sessionVariables = {
+        XDG_CURRENT_DESKTOP = "sway";
+        XDG_SESSION_TYPE = "wayland";
+        XDG_SESSION_DESKTOP = "sway";
+        XDG_CONFIG_HOME = "$HOME/.config";
+        XDG_CACHE_HOME = "$HOME/.cache";
+        XDG_DATA_HOME = "$HOME/.local/share";
+        XDG_STATE_HOME = "$HOME/.local/state";
+        NIXOS_OZONE_WL = "1";
+      };
+    })
+
    (lib.mkIf pkgs.stdenv.isLinux {
      pointerCursor = {
        gtk.enable = true;
@@ -66,8 +66,14 @@
            "The gods themselves will be my meal. Your dear companions my dessert. Upon this world I'll feast, and death shall follow in my wake. All your hate, all your rage, you will render unto me." \
            "Boring, boring, boring" \
            "Would you be 'happier' had I a 'good reason'?" \
-            "A test of your reflexes!"
-
+            "A test of your reflexes!" \
+            "Yer a wizard, Wyatt" \
+            "Yer a lizard, Wyatt" \
+            "Po-Tay-To boil em mash em stick em in a stew" \
+            "Oh look it's the cutie patootie potato!" \
+            "What a charming young man" \
+            "Wyatt, you are smart, kind, and resilient. I believe in you no matter what life throws at you! Kick this project's butt!! - Nico" \
+            "Ganbatte!"

          set choose_meme (random)"%"(count $memes)
          set choose_meme $memes[(math $choose_meme"+1")]
@@ -153,6 +153,6 @@ in {

  programs.waybar = {
    enable = pkgs.stdenv.isLinux;
-    systemd.enable = false;
+    systemd.enable = true;
  };
 }
@@ -1,178 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.desktop;
-
-  defaultWaylandPackages = with pkgs; [
-    brightnessctl
-    cliphist
-    foot
-    grim
-    libnotify
-    mako
-    networkmanagerapplet
-    playerctl
-    polkit_gnome
-    pavucontrol
-    rofi
-    slurp
-    waybar
-    wl-clipboard
-    xdg-utils
-  ];
-
-  defaultSwayPackages =
-    defaultWaylandPackages
-    ++ (with pkgs; [
-      pulseaudio
-      swayidle
-      swaylock
-      wmenu
-    ]);
-
-  resolvedDisplayManager =
-    if cfg.displayManager != "auto"
-    then cfg.displayManager
-    else if cfg.gnome.enable
-    then "gdm"
-    else if cfg.xfce.enable
-    then "lightdm"
-    else "none";
-in {
-  imports = [./xdg.nix];
-
-  options.desktop = {
-    displayManager = lib.mkOption {
-      type = lib.types.enum ["auto" "none" "gdm" "lightdm" "ly"];
-      default = "auto";
-      description = ''
-        Display manager to enable. In auto mode, GDM is used when GNOME is
-        enabled, LightDM is used when XFCE is enabled, and no display manager
-        is enabled for compositor-only configurations.
-      '';
-    };
-
-    gnome.enable = lib.mkEnableOption "the vanilla GNOME desktop environment";
-
-    xfce.enable = lib.mkEnableOption "the vanilla XFCE desktop environment";
-
-    sway = {
-      enable = lib.mkEnableOption "the Sway Wayland compositor";
-
-      extraPackages = lib.mkOption {
-        type = with lib.types; listOf package;
-        default = defaultSwayPackages;
-        defaultText = lib.literalExpression ''
-          with pkgs; [
-            brightnessctl
-            cliphist
-            foot
-            grim
-            libnotify
-            mako
-            networkmanagerapplet
-            playerctl
-            polkit_gnome
-            pulseaudio
-            pavucontrol
-            rofi
-            slurp
-            swayidle
-            swaylock
-            waybar
-            wl-clipboard
-            wmenu
-            xdg-utils
-          ]
-        '';
-        description = "Packages installed alongside Sway.";
-      };
-    };
-
-    hyprland = {
-      enable = lib.mkEnableOption "the Hyprland Wayland compositor";
-
-      extraPackages = lib.mkOption {
-        type = with lib.types; listOf package;
-        default = defaultWaylandPackages;
-        defaultText = lib.literalExpression ''
-          with pkgs; [
-            brightnessctl
-            cliphist
-            foot
-            grim
-            libnotify
-            mako
-            networkmanagerapplet
-            playerctl
-            polkit_gnome
-            pavucontrol
-            rofi
-            slurp
-            waybar
-            wl-clipboard
-            xdg-utils
-          ]
-        '';
-        description = ''
-          Packages installed alongside Hyprland. Hyprlock and Hypridle are
-          enabled separately so their NixOS integration, including PAM, is
-          configured as well.
-        '';
-      };
-    };
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.gnome.enable {
-      services.desktopManager.gnome.enable = true;
-    })
-
-    (lib.mkIf cfg.xfce.enable {
-      services.xserver = {
-        enable = true;
-        desktopManager.xfce.enable = true;
-      };
-    })
-
-    (lib.mkIf cfg.sway.enable {
-      programs.sway = {
-        enable = true;
-        wrapperFeatures.gtk = true;
-        extraPackages = cfg.sway.extraPackages;
-        extraSessionCommands = ''
-          export XDG_SESSION_TYPE=wayland
-          export XDG_SESSION_DESKTOP=sway
-          export NIXOS_OZONE_WL=1
-        '';
-      };
-    })
-
-    (lib.mkIf cfg.hyprland.enable {
-      programs = {
-        hyprland.enable = true;
-        hyprlock.enable = lib.mkDefault true;
-      };
-
-      environment.systemPackages = cfg.hyprland.extraPackages;
-    })
-
-    (lib.mkIf (resolvedDisplayManager == "gdm") {
-      services.displayManager.gdm.enable = true;
-    })
-
-    (lib.mkIf (resolvedDisplayManager == "lightdm") {
-      services.xserver = {
-        enable = true;
-        displayManager.lightdm.enable = true;
-      };
-    })
-
-    (lib.mkIf (resolvedDisplayManager == "ly") {
-      services.displayManager.ly.enable = true;
-    })
-  ];
-}
@@ -1,42 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.desktop;
-  needsGtkPortal = cfg.xfce.enable || cfg.hyprland.enable;
-  usesPortal = cfg.gnome.enable || cfg.xfce.enable || cfg.sway.enable || cfg.hyprland.enable;
-in {
-  config = lib.mkMerge [
-    # GNOME and Sway configure their own portals in NixOS. XFCE needs a
-    # portal; Hyprland benefits from GTK as a fallback to its native one.
-    (lib.mkIf needsGtkPortal {
-      xdg.portal = {
-        enable = true;
-        extraPortals = [pkgs.xdg-desktop-portal-gtk];
-      };
-    })
-
-    (lib.mkIf (cfg.sway.enable || needsGtkPortal) {
-      xdg.portal.config.common.default = ["gtk"];
-    })
-
-    (lib.mkIf (usesPortal && config.services.gnome.gnome-keyring.enable) {
-      xdg.portal.config.common."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
-    })
-
-    (lib.mkIf (cfg.sway.enable && config.services.gnome.gnome-keyring.enable) {
-      xdg.portal.config.sway."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
-    })
-
-    # A per-desktop config takes precedence over Hyprland's packaged config,
-    # so include its native portal whenever adding a Secret preference.
-    (lib.mkIf (cfg.hyprland.enable && config.services.gnome.gnome-keyring.enable) {
-      xdg.portal.config.hyprland = {
-        default = ["hyprland" "gtk"];
-        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
-      };
-    })
-  ];
-}
@@ -22,7 +22,6 @@ in {
    })
    ../../apps/gaming.nix
    ../../apps/appimage.nix
-    ../../desktop
    ../../graphics
    ../../pwrMgmt
    ../../networking/core.nix
@@ -75,6 +74,7 @@ in {
    brightnessctl
    wttrbar
    cliphist
+    xdg-desktop-portal-gtk
    xdg-utils
    flatpak-xdg-utils
    desktop-file-utils
@@ -89,10 +89,6 @@ in {
  # Enable Polkit
  security.polkit.enable = true;

-  # Enable desktop support (sway)
-  desktop.sway.enable = true;
-  desktop.displayManager = "ly";
-
  # Graphics module (../../graphics/default.nix)
  graphics = {
    enable = true;
@@ -193,6 +189,27 @@ in {
  # AppImage support
  appimage.enable = true;

+  # XDG stuff
+  xdg = {
+    portal = {
+      enable = true;
+      config = {
+        sway = {
+          default = ["wlr" "gtk"];
+          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        };
+        common = {
+          default = ["gtk"];
+          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        };
+      };
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-wlr
+        xdg-desktop-portal-gtk
+      ];
+    };
+  };
+
  # sched_ext userspace CPU scheduling stuff - idk
  services.scx = {
    enable = true;
Author	SHA1	Message	Date
gitea-actions[bot]	4965e9ed1d	chore: update flake lock	2026-10-25 07:04:48 +00:00
wymiller	b42f545195	mod: fix fish_greeting	2026-10-19 00:52:55 -04:00
gitea-actions[bot]	b27fa2440e	chore: update flake lock	2026-10-18 19:38:14 +00:00
gitea-actions[bot]	6ae398abdc	chore: update flake lock	2026-10-18 07:01:16 +00:00
wymiller	57490387aa	Merge pull request 'Update home/shell.nix' (#16 ) from cosmic_lunaria/nix-config-v2:cosmic_lunaria-patch-1 into master Reviewed-on: #16	2026-10-17 20:32:59 -05:00
cosmic_lunaria	b76df1881b	Update home/shell.nix	2026-10-17 20:02:48 -05:00
gitea-actions[bot]	3fa4fb8ef7	chore: update flake lock	2026-10-11 07:08:06 +00:00
gitea-actions[bot]	bf799ca883	chore: update flake lock	2026-10-04 07:06:46 +00:00