From aaf82b29dafa60433957b49a608519187364c414 Mon Sep 17 00:00:00 2001 From: Sascha Koenig Date: Wed, 22 Oct 2025 19:48:25 +0200 Subject: [PATCH] flake update --- flake.lock | 78 +++++++++++++------------- home/features/cli/fish.nix | 2 +- home/features/cli/nushell.nix | 7 --- home/features/cli/secrets.nix | 2 +- home/features/desktop/webapps.nix | 0 hosts/common/users/m3tam3re.nix | 2 +- hosts/m3-ares/configuration.nix | 2 +- hosts/m3-kratos/configuration.nix | 2 +- hosts/m3-kratos/default.nix | 2 +- hosts/m3-kratos/services/default.nix | 1 + hosts/m3-kratos/services/tailscale.nix | 2 +- 11 files changed, 47 insertions(+), 53 deletions(-) create mode 100644 home/features/desktop/webapps.nix diff --git a/flake.lock b/flake.lock index d59d580..0d8b6a7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760836749, + "lastModified": 1762618334, "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1758687491, - "narHash": "sha256-sy8Q+MfBe+MZzYj4MJwBDe4lkLnmhy1POO86hWZgqO8=", + "lastModified": 1763308703, + "narHash": "sha256-O9Y+Wer8wOh+N+4kcCK5p/VLrXyX+ktk0/s3HdZvJzk=", "owner": "numtide", "repo": "blueprint", - "rev": "7ecaeb70f63d14a397c73b38f57177894bb795c8", + "rev": "5a9bba070f801d63e2af3c9ef00b86b212429f4f", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1760701190, - "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1761584077, - "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -231,11 +231,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1757563845, - "narHash": "sha256-pz69vejsrB+7N+jyKxZcckTjJtzw9BCAIRzHNbFUIp0=", + "lastModified": 1762493267, + "narHash": "sha256-W/eYgKKVqCh7SJLHk6Asc4LvU3YXvGtlL29yBMGymz4=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "0a961ce8a959c521f41546af7f355e04adee5503", + "rev": "f9a04192e8fb90a48e1756989f582dc0baec2351", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1761575150, - "narHash": "sha256-/fAwaniaOKJPs74KB0L2RjitKb2Z5gT2ZmGG76rlEg4=", + "lastModified": 1764384059, + "narHash": "sha256-doxFSt1lphXDdi5Ev/QTWBAugZGDOpJHAyZBZgX9tzI=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "359cccc552cb0aa263fa00859ef7f0bb90db025e", + "rev": "9dec4068f94d22b5a4661793b6438f02cf60d089", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1761585705, - "narHash": "sha256-pYeomKfED+SCPevjt1qDCTso5xHUpggR/Fc6C3NxZRE=", + "lastModified": 1764414772, + "narHash": "sha256-QZqBuzZ/1KLfwrBkdJmLGZoGnZmL0LhNmo1nD4bIaQE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "894253673805c00029f32940ef056645095e36b2", + "rev": "a7b62f2fdb7d06fcf01be5dc6e39510e4853b876", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1761468971, - "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "lastModified": 1764316264, + "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", "type": "github" }, "original": { @@ -480,16 +480,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1764290847, + "narHash": "sha256-VwPgoDgnd628GdE3KyLqTyPF1WWh0VwT5UoKygoi8sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "cd5fedfc384cb98d9fd3827b55f4522f49efda42", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -512,11 +512,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1761583596, - "narHash": "sha256-vgspmzDr0FZW0ed8aJJ9VYF4bzTYbfzyHPCXgGDUwsQ=", + "lastModified": 1764411961, + "narHash": "sha256-frGU6lCDzWPiTSQ9CUMVEfWgUx+LhIMUgHSjIL7umVM=", "owner": "nix-community", "repo": "NUR", - "rev": "35df45088e74e0d752d0167655250f5ecb78185d", + "rev": "19c77bc00c6dab1ec487baf60a73a0ba40653c7b", "type": "github" }, "original": { @@ -686,11 +686,11 @@ ] }, "locked": { - "lastModified": 1761311587, - "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix index 819eb60..357171f 100644 --- a/home/features/cli/fish.nix +++ b/home/features/cli/fish.nix @@ -69,7 +69,7 @@ in { source /run/agenix/${config.home.username}-secrets if test (tty) = "/dev/tty1" - exec uwsm start -S -F /run/current-system/sw/bin/Hyprland + exec uwsm start -F /run/current-system/sw/bin/Hyprland end if test (tty) = "/dev/tty2" exec gamescope -O HDMI-A-1 -W 1920 -H 1080 --adaptive-sync --hdr-enabled --rt --steam -- steam -pipewire-dmabuf -tenfoot diff --git a/home/features/cli/nushell.nix b/home/features/cli/nushell.nix index 6929717..27ff565 100644 --- a/home/features/cli/nushell.nix +++ b/home/features/cli/nushell.nix @@ -67,13 +67,6 @@ in { ] } - if (tty) == "/dev/tty1" { - exec uwsm start -S -F /run/current-system/sw/bin/Hyprland - } - if (tty) == "/dev/tty2" { - exec gamescope -O HDMI-A-1 -W 1920 -H 1080 --adaptive-sync --hdr-enabled --rt --steam -- steam -pipewire-dmabuf -tenfoot - } - alias .. = cd .. alias ... = cd ... alias h = cd $env.HOME diff --git a/home/features/cli/secrets.nix b/home/features/cli/secrets.nix index df4ca6f..57a55d3 100644 --- a/home/features/cli/secrets.nix +++ b/home/features/cli/secrets.nix @@ -16,6 +16,6 @@ in { pkgs.pass-wayland.withExtensions (exts: [exts.pass-otp exts.pass-import]); }; - home.packages = with pkgs; [pinentry]; + home.packages = with pkgs; [pinentry-gnome3]; }; } diff --git a/home/features/desktop/webapps.nix b/home/features/desktop/webapps.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/common/users/m3tam3re.nix b/hosts/common/users/m3tam3re.nix index da7a58d..e150cde 100644 --- a/hosts/common/users/m3tam3re.nix +++ b/hosts/common/users/m3tam3re.nix @@ -25,7 +25,7 @@ openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix" ]; - packages = [inputs.home-manager.packages.${pkgs.system}.default]; + packages = [inputs.home-manager.packages.${pkgs.stdenv.hostPlatform.system}.default]; }; home-manager.users.m3tam3re = import ../../../home/m3tam3re/${config.networking.hostName}.nix; diff --git a/hosts/m3-ares/configuration.nix b/hosts/m3-ares/configuration.nix index 5457904..d2cb4be 100644 --- a/hosts/m3-ares/configuration.nix +++ b/hosts/m3-ares/configuration.nix @@ -63,7 +63,7 @@ # Enable the GNOME Desktop Environment. # services.xserver.displayManager.gdm.enable = true; # services.xserver.desktopManager.gnome.enable = true; - + displayManager.gdm.enable = true; # Configure keymap in X11 # services.xserver.xkb.layout = "us"; # services.xserver.xkb.options = "eurosign:e,caps:escape"; diff --git a/hosts/m3-kratos/configuration.nix b/hosts/m3-kratos/configuration.nix index 1c6dd9a..5fb9d01 100644 --- a/hosts/m3-kratos/configuration.nix +++ b/hosts/m3-kratos/configuration.nix @@ -14,7 +14,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.initrd.kernelModules = ["amdgpu"]; - boot.kernelPackages = pkgs.linuxPackages_6_16; + boot.kernelPackages = pkgs.linuxPackages_6_17; services.xserver.videoDrivers = ["amdgpu"]; security.polkit.enable = true; security.pam.services.gdm.enableGnomeKeyring = true; diff --git a/hosts/m3-kratos/default.nix b/hosts/m3-kratos/default.nix index 53ff859..d43a9aa 100644 --- a/hosts/m3-kratos/default.nix +++ b/hosts/m3-kratos/default.nix @@ -44,7 +44,7 @@ extraServices = { flatpak.enable = true; - ollama.enable = true; + ollama.enable = false; podman.enable = true; virtualisation.enable = true; }; diff --git a/hosts/m3-kratos/services/default.nix b/hosts/m3-kratos/services/default.nix index ab0f795..98b0c3c 100644 --- a/hosts/m3-kratos/services/default.nix +++ b/hosts/m3-kratos/services/default.nix @@ -25,6 +25,7 @@ userServices = true; }; }; + displayManager.gdm.enable = true; }; systemd.sleep.extraConfig = '' AllowSuspend=no diff --git a/hosts/m3-kratos/services/tailscale.nix b/hosts/m3-kratos/services/tailscale.nix index 50a22a6..7ffc610 100644 --- a/hosts/m3-kratos/services/tailscale.nix +++ b/hosts/m3-kratos/services/tailscale.nix @@ -1,6 +1,6 @@ {config, ...}: { services.tailscale = { - enable = true; + enable = false; authKeyFile = config.age.secrets.tailscale-key.path; useRoutingFeatures = "both"; extraUpFlags = [