From 73df58ccb08aeb44ff7f2b5324762533d5be9ec0 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 24 Jan 2025 22:42:28 +0100 Subject: [PATCH 01/60] sway config --- flake.nix | 2 +- hosts/toaster/network/default.nix | 55 +++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 0038003..342df6a 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix - ./modules/gnome.nix + ./modules/sway.nix ./modules/gnupg.nix ./modules/radio.nix ./modules/science.nix diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index 6d96c3c..0bf35e9 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,36 +1,27 @@ -{ lib, config, ... }: -{ +{ lib, config, pkgs, ... }: { imports = [ ./mullvad.nix ./dumpdvb.nix ./zw.nix ]; - # Networkmanager shouldn't interfere with systemd managed interfaces - networking.networkmanager.unmanaged = - let - systemd_netdevs = lib.attrsets.attrValues ( - lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs - ); - in - systemd_netdevs; + environment.systemPackages = with pkgs; [ iwgtk impala ]; - systemd.network = { - enable = true; - wait-online.enable = false; # uplink is managed by networkmanager - }; - - users.users."0xa".extraGroups = [ "networkmanager" ]; + # kick out networkmanager + networking.networkmanager.enable = lib.mkForce false; + networking.useNetworkd = true; + systemd.network.enable = true; networking = { hostName = "toaster"; firewall.enable = true; wireguard.enable = true; + wireless.iwd.enable = true; }; services.resolved = { enable = true; - dnssec = "false"; + dnssec = "allow-downgrade"; fallbackDns = [ "9.9.9.9" "2620:fe::fe" @@ -39,4 +30,34 @@ ]; }; + # we might have no interwebs at all + systemd.network.wait-online.enable = false; + + # uplinks + systemd.network.networks = { + "10-ether-uplink" = { + matchConfig.Name = "enp1s0f0"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + "10-dock-uplink" = { + matchConfig.Name = "enp5s0f4u1u1"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + dhcpV4Config = { RouteMetric = 666; }; + dhcpV6Config = { RouteMetric = 666; }; + }; + "wlan-uplink" = { + matchConfig.Name = "wlan0"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + }; + } From f72c2e676cd4d498a92a7d4897f1b9fe72e327cb Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 15 Feb 2025 16:38:10 +0100 Subject: [PATCH 02/60] dnssec is annoying --- hosts/toaster/network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index 0bf35e9..48a6f8a 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: { +{ lib, pkgs, ... }: { imports = [ ./mullvad.nix ./dumpdvb.nix @@ -21,7 +21,7 @@ services.resolved = { enable = true; - dnssec = "allow-downgrade"; + dnssec = "false"; fallbackDns = [ "9.9.9.9" "2620:fe::fe" From a35426bdac0606c3d4dfc5ddea5815f6fb835c68 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 15 Feb 2025 16:43:48 +0100 Subject: [PATCH 03/60] add ibm3270 and cozette to fonts --- modules/fonts.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 7ee909b..5fe08ab 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -26,7 +26,8 @@ twemoji-color-font twitter-color-emoji iosevka-bin - (nerdfonts.override { fonts = [ "Hack" ]; }) + cozette + (nerdfonts.override { fonts = [ "Hack" "3270" ]; }) ]; fonts.enableDefaultPackages = true; From e51332065381d99091413c899b8a5f2610af14b6 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 18 Feb 2025 09:54:25 +0100 Subject: [PATCH 04/60] software changes --- modules/desktop-software.nix | 3 --- modules/sway.nix | 14 ++++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 0ee2847..67b98f1 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -5,8 +5,6 @@ dino ffmpeg-full firefox-wayland - vivaldi - vivaldi-ffmpeg-codecs gimp inkscape signal-desktop @@ -16,7 +14,6 @@ yt-dlp element-desktop discord - spotify mpv ]; programs.steam.enable = true; diff --git a/modules/sway.nix b/modules/sway.nix index 1ce6f63..f4e3c43 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -1,5 +1,8 @@ # General Desktop-related config -{ pkgs, ... }: +{ pkgs, inputs, ... }: +let + unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; +in { imports = [ ./desktop-software.nix @@ -19,11 +22,10 @@ termusic gsettings-desktop-schemas xdg-utils - foot qt5.qtwayland bashmount - nautilus audacity + spotify-player ]; # Enable sound. @@ -61,16 +63,15 @@ ''; extraPackages = with pkgs; [ adwaita-icon-theme - alacritty bluetui foot gammastep graphicsmagick grim - i3status-rust + unstablepkgs.i3status-rust impala kanshi - mako + swaynotificationcenter pamixer rofi-wayland slurp @@ -78,6 +79,7 @@ swaylock wl-clipboard wl-mirror + xfce.thunar ]; }; environment.sessionVariables = { From b6731802a8f735d5073d04b74c54fbe5a53ecb74 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 18 Feb 2025 09:54:31 +0100 Subject: [PATCH 05/60] format --- hosts/toaster/network/default.nix | 16 ++++++++++++---- modules/basic-tools/default.nix | 10 +++++++++- modules/fonts.nix | 7 ++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index 48a6f8a..ee0bdbe 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,11 +1,15 @@ -{ lib, pkgs, ... }: { +{ lib, pkgs, ... }: +{ imports = [ ./mullvad.nix ./dumpdvb.nix ./zw.nix ]; - environment.systemPackages = with pkgs; [ iwgtk impala ]; + environment.systemPackages = with pkgs; [ + iwgtk + impala + ]; # kick out networkmanager networking.networkmanager.enable = lib.mkForce false; @@ -48,8 +52,12 @@ DHCP = "yes"; IPv6AcceptRA = true; }; - dhcpV4Config = { RouteMetric = 666; }; - dhcpV6Config = { RouteMetric = 666; }; + dhcpV4Config = { + RouteMetric = 666; + }; + dhcpV6Config = { + RouteMetric = 666; + }; }; "wlan-uplink" = { matchConfig.Name = "wlan0"; diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix index 3ea8833..d5e81d3 100644 --- a/modules/basic-tools/default.nix +++ b/modules/basic-tools/default.nix @@ -51,7 +51,15 @@ whois mtr ] - ++ (if config.networking.hostName == "toaster" then [ gitFull git-lfs ] else [ git ]); + ++ ( + if config.networking.hostName == "toaster" then + [ + gitFull + git-lfs + ] + else + [ git ] + ); environment.variables = let diff --git a/modules/fonts.nix b/modules/fonts.nix index 5fe08ab..a3516e9 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -27,7 +27,12 @@ twitter-color-emoji iosevka-bin cozette - (nerdfonts.override { fonts = [ "Hack" "3270" ]; }) + (nerdfonts.override { + fonts = [ + "Hack" + "3270" + ]; + }) ]; fonts.enableDefaultPackages = true; From b0bc8919c23318ac8f3ba02887bd9a64060ce935 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Thu, 20 Feb 2025 23:22:10 +0100 Subject: [PATCH 06/60] add zathura --- modules/sway.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/sway.nix b/modules/sway.nix index f4e3c43..44ee647 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -26,6 +26,7 @@ in bashmount audacity spotify-player + zathura ]; # Enable sound. From 1e3e2d083ce8f586a47c6afe40cbb5b33c0b27c6 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Thu, 20 Feb 2025 23:31:24 +0100 Subject: [PATCH 07/60] new name for telegram --- modules/desktop-software.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 67b98f1..b112de6 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -8,7 +8,7 @@ gimp inkscape signal-desktop - tdesktop + telegram-desktop tor-browser wl-clipboard yt-dlp From 8f7f58b9d1ce0a075390b7216eb142efbb36202b Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 21 Feb 2025 00:52:57 +0100 Subject: [PATCH 08/60] write tmp to disk --- hosts/toaster/hardware-configuration.nix | 6 ++++++ hosts/toaster/zfs.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hosts/toaster/hardware-configuration.nix b/hosts/toaster/hardware-configuration.nix index 1b0fbb0..318ff03 100644 --- a/hosts/toaster/hardware-configuration.nix +++ b/hosts/toaster/hardware-configuration.nix @@ -49,6 +49,12 @@ options = [ "zfsutil" ]; }; + fileSystems."/tmp" = { + device = "zpool/nocomp/tmp"; + fsType = "zfs"; + options = [ "zfsutil" ]; + }; + fileSystems."/boot" = { device = "/dev/disk/by-uuid/A170-F83D"; fsType = "vfat"; diff --git a/hosts/toaster/zfs.nix b/hosts/toaster/zfs.nix index 70cc5c9..1970bbf 100644 --- a/hosts/toaster/zfs.nix +++ b/hosts/toaster/zfs.nix @@ -19,6 +19,7 @@ supportedFilesystems = [ "zfs" ]; kernelParams = [ "nohibernate" ]; plymouth.enable = false; - tmp.useTmpfs = true; + tmp.useTmpfs = false; + tmp.cleanOnBoot = true; }; } From 2669f23735f6913675e3ed04de7af3d04249f05c Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 21 Feb 2025 00:53:12 +0100 Subject: [PATCH 09/60] bump lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d608a5c..ccb1bf2 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1739546930, - "narHash": "sha256-m9s8XjIFd9ByX45/mnsryQa0G5ncMjOBJE4kAOHPoUI=", - "rev": "1077bc626e8dfc153524da40eddad46ef893d66e", + "lastModified": 1740025708, + "narHash": "sha256-TQ8EQoulNFD2nP94Aw3W17cjlV3F+fMpDsV6LOrrkbY=", + "rev": "e335a26d5cd8371ea836d1166b627eaf17427299", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1077bc626e8dfc153524da40eddad46ef893d66e.tar.gz?rev=1077bc626e8dfc153524da40eddad46ef893d66e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e335a26d5cd8371ea836d1166b627eaf17427299.tar.gz?rev=e335a26d5cd8371ea836d1166b627eaf17427299" }, "original": { "type": "tarball", @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739484910, - "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { From e9625f41c4c0d5b4f99bee89a4e5d398bbb1cf24 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 23 Feb 2025 02:34:20 +0100 Subject: [PATCH 10/60] software changes --- modules/basic-tools/default.nix | 2 +- modules/sway.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix index d5e81d3..a917168 100644 --- a/modules/basic-tools/default.nix +++ b/modules/basic-tools/default.nix @@ -39,7 +39,6 @@ exfatprogs nmap bind - nnn lf man-pages unzip @@ -50,6 +49,7 @@ sshfs whois mtr + joshuto ] ++ ( if config.networking.hostName == "toaster" then diff --git a/modules/sway.nix b/modules/sway.nix index 44ee647..47f5698 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -27,6 +27,7 @@ in audacity spotify-player zathura + ncdu ]; # Enable sound. From db8daf4f061e13961eef5142dcdc9816a094c9a1 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 23 Feb 2025 02:34:27 +0100 Subject: [PATCH 11/60] bump lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ccb1bf2..e088cc7 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740025708, - "narHash": "sha256-TQ8EQoulNFD2nP94Aw3W17cjlV3F+fMpDsV6LOrrkbY=", - "rev": "e335a26d5cd8371ea836d1166b627eaf17427299", + "lastModified": 1740253065, + "narHash": "sha256-ucwXcftJ7DHjk1UA2LmfHXkDPoCgfB4uadwFUCBvc8w=", + "rev": "82c7e76c9c2d829dc11c22b32173a40056cc44ef", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e335a26d5cd8371ea836d1166b627eaf17427299.tar.gz?rev=e335a26d5cd8371ea836d1166b627eaf17427299" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/82c7e76c9c2d829dc11c22b32173a40056cc44ef.tar.gz?rev=82c7e76c9c2d829dc11c22b32173a40056cc44ef" }, "original": { "type": "tarball", From 019a309ddaf9f43357c5de1c01873bb7edaac2f4 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 19 Feb 2025 01:57:32 +0100 Subject: [PATCH 12/60] Revert "sway config" This reverts commit 73df58ccb08aeb44ff7f2b5324762533d5be9ec0. --- flake.nix | 2 +- hosts/toaster/network/default.nix | 59 ++++++++----------------------- 2 files changed, 16 insertions(+), 45 deletions(-) diff --git a/flake.nix b/flake.nix index 342df6a..0038003 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix - ./modules/sway.nix + ./modules/gnome.nix ./modules/gnupg.nix ./modules/radio.nix ./modules/science.nix diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index ee0bdbe..6d96c3c 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, config, ... }: { imports = [ ./mullvad.nix @@ -6,21 +6,26 @@ ./zw.nix ]; - environment.systemPackages = with pkgs; [ - iwgtk - impala - ]; + # Networkmanager shouldn't interfere with systemd managed interfaces + networking.networkmanager.unmanaged = + let + systemd_netdevs = lib.attrsets.attrValues ( + lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs + ); + in + systemd_netdevs; - # kick out networkmanager - networking.networkmanager.enable = lib.mkForce false; - networking.useNetworkd = true; - systemd.network.enable = true; + systemd.network = { + enable = true; + wait-online.enable = false; # uplink is managed by networkmanager + }; + + users.users."0xa".extraGroups = [ "networkmanager" ]; networking = { hostName = "toaster"; firewall.enable = true; wireguard.enable = true; - wireless.iwd.enable = true; }; services.resolved = { @@ -34,38 +39,4 @@ ]; }; - # we might have no interwebs at all - systemd.network.wait-online.enable = false; - - # uplinks - systemd.network.networks = { - "10-ether-uplink" = { - matchConfig.Name = "enp1s0f0"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; - }; - "10-dock-uplink" = { - matchConfig.Name = "enp5s0f4u1u1"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; - dhcpV4Config = { - RouteMetric = 666; - }; - dhcpV6Config = { - RouteMetric = 666; - }; - }; - "wlan-uplink" = { - matchConfig.Name = "wlan0"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; - }; - }; - } From 38c5c53a28c62f00af5c523fa5ed8c1edff4336f Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 23 Feb 2025 13:57:38 +0100 Subject: [PATCH 13/60] bump lock --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index e088cc7..2e39d99 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740253065, - "narHash": "sha256-ucwXcftJ7DHjk1UA2LmfHXkDPoCgfB4uadwFUCBvc8w=", - "rev": "82c7e76c9c2d829dc11c22b32173a40056cc44ef", + "lastModified": 1740304046, + "narHash": "sha256-BaI27pORky5j8slRzGJTzaWR5tuKvY1z9I+n7n16YgM=", + "rev": "c64a9db6bb03d2755757188394d15fa1a0e12406", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/82c7e76c9c2d829dc11c22b32173a40056cc44ef.tar.gz?rev=82c7e76c9c2d829dc11c22b32173a40056cc44ef" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c64a9db6bb03d2755757188394d15fa1a0e12406.tar.gz?rev=c64a9db6bb03d2755757188394d15fa1a0e12406" }, "original": { "type": "tarball", @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739923778, - "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", + "lastModified": 1740162160, + "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", + "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "type": "github" }, "original": { From 2a9d765c94100cbf12b863714a5fc30e64b1c4a3 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 25 Feb 2025 17:36:42 +0100 Subject: [PATCH 14/60] bump lock --- flake.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 2e39d99..bb99006 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1739612324, - "narHash": "sha256-3RQgKLNSKlcLtdfAo7Zx3+Q+3Bwgy8rx3gZ6ejTeh1w=", + "lastModified": 1740420811, + "narHash": "sha256-ZfSnVdW2S9G4dYFxnW7sB/XgBe2SR17WHTb0eDNkkOk=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "efd801f6faecf6caf489fa03dbd6e32e416bec6d", + "rev": "c79e9b78104e9d8c406445d575623c2770d7d99a", "type": "github" }, "original": { @@ -30,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1738183650, - "narHash": "sha256-4XdYlqfd23TVPaJ0R5tEBIpDXLV4mFHdXhIWp5dIvIE=", + "lastModified": 1740398117, + "narHash": "sha256-eafk3lCFG3l1OKt8xoKZjbDFcOUFQgpivMMT4GjaNWU=", "owner": "goauthentik", "repo": "authentik", - "rev": "f1b7a9f934e6b58a1884ba753575eac6267f4b6e", + "rev": "5c5cc1c7daa4248c5a2c29ac47f3639d4eaa8ff5", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.12.3", + "ref": "version/2025.2.0", "repo": "authentik", "type": "github" } @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740304046, - "narHash": "sha256-BaI27pORky5j8slRzGJTzaWR5tuKvY1z9I+n7n16YgM=", - "rev": "c64a9db6bb03d2755757188394d15fa1a0e12406", + "lastModified": 1740449362, + "narHash": "sha256-UJaNM71Lai/GdExpjqzhWRcLLJf5TfISSHZgA/KMU6M=", + "rev": "42a8fb96567ef4ffae9494056da0c8ca5a7634df", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c64a9db6bb03d2755757188394d15fa1a0e12406.tar.gz?rev=c64a9db6bb03d2755757188394d15fa1a0e12406" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/42a8fb96567ef4ffae9494056da0c8ca5a7634df.tar.gz?rev=42a8fb96567ef4ffae9494056da0c8ca5a7634df" }, "original": { "type": "tarball", @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740387674, + "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -479,11 +479,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738741221, - "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=", + "lastModified": 1739883580, + "narHash": "sha256-3ydikhrNaWy8j0cqHju/94PcD4GZ9T4Ju4rHh34oz3k=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb", + "rev": "d90f9db68a4bda31c346be16dfd8d3263be4547e", "type": "github" }, "original": { From a1bb8d867ae7d222d1824fe860a18d2a2319f9f5 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 25 Feb 2025 17:37:15 +0100 Subject: [PATCH 15/60] software changes --- modules/desktop-software.nix | 1 + modules/gnome.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index b112de6..a2fe435 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -15,6 +15,7 @@ element-desktop discord mpv + dwarf-fortress-packages.dwarf-fortress-full ]; programs.steam.enable = true; } diff --git a/modules/gnome.nix b/modules/gnome.nix index 897c4d3..506fbcf 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -14,6 +14,7 @@ gnome-tweaks qbittorrent gnomeExtensions.caffeine + spotify ]; environment.gnome.excludePackages = with pkgs; [ From d84bc75c427616d124d4310623f548242ac57700 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Thu, 27 Feb 2025 19:00:56 +0100 Subject: [PATCH 16/60] bump lock --- flake.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index bb99006..15fa325 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1740420811, - "narHash": "sha256-ZfSnVdW2S9G4dYFxnW7sB/XgBe2SR17WHTb0eDNkkOk=", + "lastModified": 1740601740, + "narHash": "sha256-YQ8lMeT/KkMDavXrqPvoO6pKQdfSSAZBcNp/Cer4vWc=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "c79e9b78104e9d8c406445d575623c2770d7d99a", + "rev": "bfcad34becd76d148e1ad537b5dcbd58d858a5bb", "type": "github" }, "original": { @@ -30,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1740398117, - "narHash": "sha256-eafk3lCFG3l1OKt8xoKZjbDFcOUFQgpivMMT4GjaNWU=", + "lastModified": 1740599692, + "narHash": "sha256-KZalpsM9rvki9GD+urf8idHOEnvBJtkSvE1b2b4KL/4=", "owner": "goauthentik", "repo": "authentik", - "rev": "5c5cc1c7daa4248c5a2c29ac47f3639d4eaa8ff5", + "rev": "31fe0e59234e487a42012510d1a4e4819b9aba26", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.2.0", + "ref": "version/2025.2.1", "repo": "authentik", "type": "github" } @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740449362, - "narHash": "sha256-UJaNM71Lai/GdExpjqzhWRcLLJf5TfISSHZgA/KMU6M=", - "rev": "42a8fb96567ef4ffae9494056da0c8ca5a7634df", + "lastModified": 1740647693, + "narHash": "sha256-pYxhtDAOmlbP4XqgjIvbpi7CFtX8USH6DlRybS2Jxu4=", + "rev": "03ade5e6d75cb7705900cf696505b836fc831be0", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/42a8fb96567ef4ffae9494056da0c8ca5a7634df.tar.gz?rev=42a8fb96567ef4ffae9494056da0c8ca5a7634df" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/03ade5e6d75cb7705900cf696505b836fc831be0.tar.gz?rev=03ade5e6d75cb7705900cf696505b836fc831be0" }, "original": { "type": "tarball", @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740339700, - "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", + "lastModified": 1740463929, + "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", + "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { From 6d0f775d73b10a9c60c1ae1d6ec87e0bb8f63103 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 28 Feb 2025 12:15:51 +0100 Subject: [PATCH 17/60] fuck mozilla --- flake.nix | 1 - modules/chromium.nix | 11 +++++------ modules/desktop-software.nix | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 0038003..9a59f52 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,6 @@ ./modules/tlp.nix ./modules/virtualization.nix ./hosts/toaster/secure-boot.nix - ./modules/chromium.nix ./modules/mail ./modules/wg ]; diff --git a/modules/chromium.nix b/modules/chromium.nix index 30d6faf..8b4a574 100644 --- a/modules/chromium.nix +++ b/modules/chromium.nix @@ -5,17 +5,16 @@ chromium ]; - nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode"; + nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode"; programs.chromium = { enable = true; extensions = [ - # "pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # privacy badger "ekhagklcjbdpajgpjgmbionohlpdbjgc" # zotero connector "nngceckbapebfimnlniiiahkandclblb" # bitwarden - # "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin - # "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite + "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite "mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock + "khncfooichmfjbepaaaebmommgaepoid" # unhook ]; extraOpts = { "BrowserSignin" = 0; @@ -27,9 +26,9 @@ "AutoplayAllowed" = false; "DefaultNotificationSetting" = 2; "BackgroundModeEnabled" = false; - # "DefaultSearchProviderEnabled" = true; + "DefaultSearchProviderEnabled" = true; # "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}"; - # "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}"; + "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}"; "SearchSuggestEnable" = false; }; }; diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index a2fe435..960adc4 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -1,10 +1,12 @@ { pkgs, ... }: { + imports = [ + ./chromium.nix + ]; environment.systemPackages = with pkgs; [ blender dino ffmpeg-full - firefox-wayland gimp inkscape signal-desktop From 205086969b18e240ade93dccc08fa0153d5c1f9b Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 28 Feb 2025 12:16:07 +0100 Subject: [PATCH 18/60] back to tide --- modules/basic-tools/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/basic-tools/fish.nix b/modules/basic-tools/fish.nix index 5099bbd..5e06de3 100644 --- a/modules/basic-tools/fish.nix +++ b/modules/basic-tools/fish.nix @@ -5,7 +5,7 @@ fzf fishPlugins.done fishPlugins.fzf-fish - fishPlugins.hydro + fishPlugins.tide ]; programs.fish = { From f7b3b0c0036cc3455ebdc7772a2df946569a0966 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 28 Feb 2025 13:44:28 +0100 Subject: [PATCH 19/60] bump lock --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 15fa325..5fb3a84 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740647693, - "narHash": "sha256-pYxhtDAOmlbP4XqgjIvbpi7CFtX8USH6DlRybS2Jxu4=", - "rev": "03ade5e6d75cb7705900cf696505b836fc831be0", + "lastModified": 1740700266, + "narHash": "sha256-4ucbGdPUYmwE4ezj9fAw6Bm3/KEgOI3PTMKWv89KuIw=", + "rev": "5778998cfa2ba0e4cd49873c0b0892f9c81de247", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/03ade5e6d75cb7705900cf696505b836fc831be0.tar.gz?rev=03ade5e6d75cb7705900cf696505b836fc831be0" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5778998cfa2ba0e4cd49873c0b0892f9c81de247.tar.gz?rev=5778998cfa2ba0e4cd49873c0b0892f9c81de247" }, "original": { "type": "tarball", @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740463929, - "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { From c48f8889af9828311ac61eefaa8e225a8943c71f Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 28 Feb 2025 20:48:18 +0100 Subject: [PATCH 20/60] chromium: enable widevine --- modules/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/chromium.nix b/modules/chromium.nix index 8b4a574..6c7da2f 100644 --- a/modules/chromium.nix +++ b/modules/chromium.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - chromium + (chromium.override { enableWideVine = true; }) ]; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode"; From 33a259f4804e468f6abac7fee4f558c5dc34264e Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 3 Mar 2025 13:32:39 +0100 Subject: [PATCH 21/60] bump lock --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 5fb3a84..de97eae 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740700266, - "narHash": "sha256-4ucbGdPUYmwE4ezj9fAw6Bm3/KEgOI3PTMKWv89KuIw=", - "rev": "5778998cfa2ba0e4cd49873c0b0892f9c81de247", + "lastModified": 1741212440, + "narHash": "sha256-UrNM90hCGa4Ee8R7v6oyBL9Mqi5XbyNdUAireOzgzGs=", + "rev": "f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5778998cfa2ba0e4cd49873c0b0892f9c81de247.tar.gz?rev=5778998cfa2ba0e4cd49873c0b0892f9c81de247" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08.tar.gz?rev=f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08" }, "original": { "type": "tarball", @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741325094, + "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1741196730, + "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { From ccb39b1190201df0c91f07e9f9950e4685a9fb07 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 8 Mar 2025 18:07:30 +0100 Subject: [PATCH 22/60] add ghosttty --- modules/gnome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/gnome.nix b/modules/gnome.nix index 506fbcf..738fd33 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -15,6 +15,7 @@ qbittorrent gnomeExtensions.caffeine spotify + ghostty ]; environment.gnome.excludePackages = with pkgs; [ From d6a77c851a5174a917976ff62f5919b478dad116 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 8 Mar 2025 18:07:44 +0100 Subject: [PATCH 23/60] disable ad stuff automatically --- modules/chromium.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/chromium.nix b/modules/chromium.nix index 6c7da2f..5c971c6 100644 --- a/modules/chromium.nix +++ b/modules/chromium.nix @@ -18,7 +18,7 @@ ]; extraOpts = { "BrowserSignin" = 0; - # "SyncDisabled" = true; + "SyncDisabled" = true; "PasswordManagerEnabled" = false; "TranslateEnabled" = false; "AutofillAddressEnabled" = false; @@ -30,6 +30,11 @@ # "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}"; "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}"; "SearchSuggestEnable" = false; + "BlockThirdPartyCookies" = true; + "PrivacySandboxAdMeasurementEnabled" = false; + "PrivacySandboxAdTopicsEnabled" = false; + "PrivacySandboxPromptEnabled" = false; + "PrivacySandboxSiteEnabledAdsEnabled" = false; }; }; } From e5bd758c7bbfe404f9cb11355145bcfb0614a2f7 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 8 Mar 2025 18:08:22 +0100 Subject: [PATCH 24/60] bump lock --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index de97eae..9c246cc 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1741212440, - "narHash": "sha256-UrNM90hCGa4Ee8R7v6oyBL9Mqi5XbyNdUAireOzgzGs=", - "rev": "f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08", + "lastModified": 1741358751, + "narHash": "sha256-cDPg74UirjlGcVjB9qI/8ImkdEJ9p2y8Y2FQBfU8KzY=", + "rev": "93c3ca4e92b8cd1a129498f4c3f4c48558032d46", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08.tar.gz?rev=f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/93c3ca4e92b8cd1a129498f4c3f4c48558032d46.tar.gz?rev=93c3ca4e92b8cd1a129498f4c3f4c48558032d46" }, "original": { "type": "tarball", @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741196730, - "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { From ffd3541e9379c95ca6a0d7327bbd34fa94019dff Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 9 Mar 2025 17:15:51 +0100 Subject: [PATCH 25/60] add obs --- modules/desktop-software.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 960adc4..54dcab0 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -18,6 +18,7 @@ discord mpv dwarf-fortress-packages.dwarf-fortress-full + obs-studio ]; programs.steam.enable = true; } From dbe681dda9e090a58a225aa095d4026d06811d3c Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 10 Mar 2025 19:43:39 +0100 Subject: [PATCH 26/60] add fractal --- modules/gnome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/gnome.nix b/modules/gnome.nix index 738fd33..33aeb50 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -16,6 +16,7 @@ gnomeExtensions.caffeine spotify ghostty + fractal ]; environment.gnome.excludePackages = with pkgs; [ From 0f41a19f3af3e9add8fcbc0c12bef1fd75ff208a Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 10 Mar 2025 19:43:59 +0100 Subject: [PATCH 27/60] bump lock --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 9c246cc..198cc6d 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1741358751, - "narHash": "sha256-cDPg74UirjlGcVjB9qI/8ImkdEJ9p2y8Y2FQBfU8KzY=", - "rev": "93c3ca4e92b8cd1a129498f4c3f4c48558032d46", + "lastModified": 1741556509, + "narHash": "sha256-Av7lhGzOjduWaq+0Wp1xR8jlTtkyhBmSZJy1G36hNtk=", + "rev": "423a34393759d75683ed84b470239a8d8f9a84ed", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/93c3ca4e92b8cd1a129498f4c3f4c48558032d46.tar.gz?rev=93c3ca4e92b8cd1a129498f4c3f4c48558032d46" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/423a34393759d75683ed84b470239a8d8f9a84ed.tar.gz?rev=423a34393759d75683ed84b470239a8d8f9a84ed" }, "original": { "type": "tarball", @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1741445498, + "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { From 94f292505473b5cf414440d654960ca15265b3bf Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 12 Mar 2025 18:53:22 +0100 Subject: [PATCH 28/60] bump lock --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 198cc6d..36aaad2 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1741556509, - "narHash": "sha256-Av7lhGzOjduWaq+0Wp1xR8jlTtkyhBmSZJy1G36hNtk=", - "rev": "423a34393759d75683ed84b470239a8d8f9a84ed", + "lastModified": 1741730072, + "narHash": "sha256-bHsQBdUz2l+DKXcNrCgul1fdMo8MO2YaJo+Lp84GL00=", + "rev": "85a140accb5592c9b5a73f5ea2156f5b0c853d1c", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/423a34393759d75683ed84b470239a8d8f9a84ed.tar.gz?rev=423a34393759d75683ed84b470239a8d8f9a84ed" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85a140accb5592c9b5a73f5ea2156f5b0c853d1c.tar.gz?rev=85a140accb5592c9b5a73f5ea2156f5b0c853d1c" }, "original": { "type": "tarball", @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741445498, - "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1741644481, + "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "e653d71e82575a43fe9d228def8eddb73887b866", "type": "github" }, "original": { From 5464226af78c9c461506ab75d0db3acfa22541fa Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 17 Mar 2025 11:28:51 +0100 Subject: [PATCH 29/60] bump lock --- flake.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 36aaad2..628cb16 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1741730072, - "narHash": "sha256-bHsQBdUz2l+DKXcNrCgul1fdMo8MO2YaJo+Lp84GL00=", - "rev": "85a140accb5592c9b5a73f5ea2156f5b0c853d1c", + "lastModified": 1742165831, + "narHash": "sha256-/ssmsf50UERQNlOcUuyfvigcnCNckAhAPZMo0+Y3mdY=", + "rev": "2a336813ad2a4d64d027830507276da32927d215", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85a140accb5592c9b5a73f5ea2156f5b0c853d1c.tar.gz?rev=85a140accb5592c9b5a73f5ea2156f5b0c853d1c" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a336813ad2a4d64d027830507276da32927d215.tar.gz?rev=2a336813ad2a4d64d027830507276da32927d215" }, "original": { "type": "tarball", @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1738176840, - "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", - "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", + "lastModified": 1741894565, + "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=", + "rev": "a6da43f8193d9e329bba1795c42590c27966082e", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a6da43f8193d9e329bba1795c42590c27966082e.tar.gz?rev=a6da43f8193d9e329bba1795c42590c27966082e" }, "original": { "type": "tarball", @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742180333, + "narHash": "sha256-SrvP0G0fxz35lvQxBhAeJOl6+BueIsxJ4azMX+l/kAU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "113cd3916682def185290145924fa30b30bda972", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741600792, - "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1741644481, - "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", + "lastModified": 1742206174, + "narHash": "sha256-Fwo/KZl8+OLvm/XcA/6cSvoG2XxHrKNITR08S78pGus=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e653d71e82575a43fe9d228def8eddb73887b866", + "rev": "c00da36830ae93f200b4a10eae0a56b733616774", "type": "github" }, "original": { From 0d5bc74f8840864c28d1670c5a1c4cced81f1f2e Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 25 Feb 2025 22:21:34 +0100 Subject: [PATCH 30/60] some initial work on niri --- flake.lock | 131 ++++++++++++++++++++++++++++++ flake.nix | 21 ++++- hosts/toaster/0xa-home.nix | 21 +++++ hosts/toaster/network/default.nix | 59 ++++++++++---- modules/{sway.nix => niri.nix} | 60 ++++++-------- 5 files changed, 243 insertions(+), 49 deletions(-) create mode 100644 hosts/toaster/0xa-home.nix rename modules/{sway.nix => niri.nix} (71%) diff --git a/flake.lock b/flake.lock index 628cb16..06b446c 100644 --- a/flake.lock +++ b/flake.lock @@ -248,6 +248,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -363,6 +384,65 @@ "type": "github" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1742108116, + "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "824f10012de455a1d0ef795a605f28948ee10467", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "ref": "main", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1742103165, + "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -445,6 +525,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1742069588, @@ -523,10 +619,12 @@ "inputs": { "authentik-nix": "authentik-nix", "flake-utils": "flake-utils_2", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "lix": "lix", "lix-module": "lix-module", "microvm": "microvm", + "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -717,6 +815,39 @@ "type": "git", "url": "https://git.oxapentane.com/0xa/website.git" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1742083780, + "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9a59f52..1dca929 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,16 @@ inputs.flake-utils.follows = "flake-utils"; }; + home-manager = { + url = "github:nix-community/home-manager/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + niri = { + url = "github:sodiboo/niri-flake/main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + tmux-yank = { url = "github:tmux-plugins/tmux-yank"; flake = false; @@ -56,9 +66,11 @@ outputs = inputs@{ authentik-nix, + home-manager, lanzaboote, lix-module, microvm, + niri, nixos-hardware, nixpkgs, sops-nix, @@ -105,13 +117,20 @@ lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3 lix-module.nixosModules.default + home-manager.nixosModules.home-manager + niri.nixosModules.niri + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users."0xa" = import ./hosts/toaster/0xa-home.nix; + } ./hosts/toaster ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix - ./modules/gnome.nix + ./modules/niri.nix ./modules/gnupg.nix ./modules/radio.nix ./modules/science.nix diff --git a/hosts/toaster/0xa-home.nix b/hosts/toaster/0xa-home.nix new file mode 100644 index 0000000..b3ff5eb --- /dev/null +++ b/hosts/toaster/0xa-home.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: +{ + home.stateVersion = "24.11"; + + home.pointerCursor = { + name = "Banana"; + size = 32; + package = pkgs.banana-cursor; + x11.enable = true; + gtk.enable = true; + }; + + gtk = { + enable = true; + cursorTheme = { + name = "Banana"; + size = 32; + package = pkgs.banana-cursor; + }; + }; +} diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index 6d96c3c..ee0bdbe 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, pkgs, ... }: { imports = [ ./mullvad.nix @@ -6,26 +6,21 @@ ./zw.nix ]; - # Networkmanager shouldn't interfere with systemd managed interfaces - networking.networkmanager.unmanaged = - let - systemd_netdevs = lib.attrsets.attrValues ( - lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs - ); - in - systemd_netdevs; + environment.systemPackages = with pkgs; [ + iwgtk + impala + ]; - systemd.network = { - enable = true; - wait-online.enable = false; # uplink is managed by networkmanager - }; - - users.users."0xa".extraGroups = [ "networkmanager" ]; + # kick out networkmanager + networking.networkmanager.enable = lib.mkForce false; + networking.useNetworkd = true; + systemd.network.enable = true; networking = { hostName = "toaster"; firewall.enable = true; wireguard.enable = true; + wireless.iwd.enable = true; }; services.resolved = { @@ -39,4 +34,38 @@ ]; }; + # we might have no interwebs at all + systemd.network.wait-online.enable = false; + + # uplinks + systemd.network.networks = { + "10-ether-uplink" = { + matchConfig.Name = "enp1s0f0"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + "10-dock-uplink" = { + matchConfig.Name = "enp5s0f4u1u1"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + dhcpV4Config = { + RouteMetric = 666; + }; + dhcpV6Config = { + RouteMetric = 666; + }; + }; + "wlan-uplink" = { + matchConfig.Name = "wlan0"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + }; + } diff --git a/modules/sway.nix b/modules/niri.nix similarity index 71% rename from modules/sway.nix rename to modules/niri.nix index 47f5698..79c4ec9 100644 --- a/modules/sway.nix +++ b/modules/niri.nix @@ -4,6 +4,10 @@ let unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; in { + nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + + programs.niri.enable = true; + imports = [ ./desktop-software.nix ./fonts.nix @@ -28,6 +32,25 @@ in spotify-player zathura ncdu + adwaita-icon-theme + bluetui + foot + gammastep + graphicsmagick + grim + unstablepkgs.i3status-rust + impala + kanshi + pamixer + wofi + slurp + swayidle + swaylock + wl-clipboard + wl-mirror + xfce.thunar + banana-cursor + fuzzel ]; # Enable sound. @@ -52,38 +75,9 @@ in programs.light.enable = true; programs.xwayland.enable = true; - programs.sway = { - enable = true; - wrapperFeatures.gtk = true; - extraSessionCommands = '' - export SDL_VIDEODRIVER=wayland - export QT_QPA_PLATFORM=wayland-egl - export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - export QT_QPA_PLATFORMTHEME="gnome" - export QT_STYLE_OVERRIDE="adwaita-dark" - # export WLR_DRM_NO_ATOMIC=1 - ''; - extraPackages = with pkgs; [ - adwaita-icon-theme - bluetui - foot - gammastep - graphicsmagick - grim - unstablepkgs.i3status-rust - impala - kanshi - swaynotificationcenter - pamixer - rofi-wayland - slurp - swayidle - swaylock - wl-clipboard - wl-mirror - xfce.thunar - ]; - }; + + programs.hyprland.enable = true; + environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; }; @@ -118,7 +112,7 @@ in enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.sway}/bin/sway"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri"; }; }; }; From 32e4cd5324f1968ff880e03484f731688688da55 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 18 Mar 2025 18:25:54 +0100 Subject: [PATCH 31/60] finish niri config --- modules/niri.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/niri.nix b/modules/niri.nix index 79c4ec9..1a8b59d 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -17,7 +17,6 @@ in qbittorrent gajim imv - swayimg mpv evince brightnessctl @@ -34,23 +33,23 @@ in ncdu adwaita-icon-theme bluetui - foot gammastep graphicsmagick - grim unstablepkgs.i3status-rust impala kanshi pamixer - wofi - slurp swayidle swaylock wl-clipboard - wl-mirror xfce.thunar banana-cursor fuzzel + alacritty + unstablepkgs.i3bar-river + mako + swww + oculante ]; # Enable sound. @@ -84,7 +83,7 @@ in xdg.portal = { enable = true; wlr.enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + extraPortals = [ pkgs.xdg-desktop-portal-gnome ]; }; services.udisks2.enable = true; @@ -112,7 +111,7 @@ in enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri-session"; }; }; }; From b729d2f7d950207b8566dcd1c134936acdd1137f Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 18 Mar 2025 18:26:00 +0100 Subject: [PATCH 32/60] bump lock --- flake.lock | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 06b446c..68e1cc5 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1740601740, - "narHash": "sha256-YQ8lMeT/KkMDavXrqPvoO6pKQdfSSAZBcNp/Cer4vWc=", + "lastModified": 1742246110, + "narHash": "sha256-bjJDxW3Z3clNIkgwEktWhFSpU9UyftisDfK3XYzdRps=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "bfcad34becd76d148e1ad537b5dcbd58d858a5bb", + "rev": "04f5e14643b8b37304966767074fbe0efcadab9f", "type": "github" }, "original": { @@ -30,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1740599692, - "narHash": "sha256-KZalpsM9rvki9GD+urf8idHOEnvBJtkSvE1b2b4KL/4=", + "lastModified": 1742236492, + "narHash": "sha256-Uz7qldS44pxduLcYKf+cCq4WvjoslDR4PwRqivY/4uI=", "owner": "goauthentik", "repo": "authentik", - "rev": "31fe0e59234e487a42012510d1a4e4819b9aba26", + "rev": "3adf79c4939276e108c25c719843b6174e9e22fd", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.2.1", + "ref": "version/2025.2.2", "repo": "authentik", "type": "github" } @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742165831, - "narHash": "sha256-/ssmsf50UERQNlOcUuyfvigcnCNckAhAPZMo0+Y3mdY=", - "rev": "2a336813ad2a4d64d027830507276da32927d215", + "lastModified": 1742313775, + "narHash": "sha256-qE8XqkuoWuH2np+NNGGNG8qWN2zPa0ldAM0olaySf+s=", + "rev": "6e6ff5827276ed2c4cf549b9fa898eb1e9566e57", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a336813ad2a4d64d027830507276da32927d215.tar.gz?rev=2a336813ad2a4d64d027830507276da32927d215" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6e6ff5827276ed2c4cf549b9fa898eb1e9566e57.tar.gz?rev=6e6ff5827276ed2c4cf549b9fa898eb1e9566e57" }, "original": { "type": "tarball", @@ -396,11 +396,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742108116, - "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=", + "lastModified": 1742305115, + "narHash": "sha256-EJu/9UNo8ndiZ7AUVTazWQOA4lHUaTkorvgVExo2LLs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "824f10012de455a1d0ef795a605f28948ee10467", + "rev": "bc4f3a4d3d0fb9be399faf525caffd5b664c5d31", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742103165, - "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", + "lastModified": 1742276600, + "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=", "owner": "YaLTeR", "repo": "niri", - "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", + "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a", "type": "github" }, "original": { @@ -467,11 +467,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742180333, - "narHash": "sha256-SrvP0G0fxz35lvQxBhAeJOl6+BueIsxJ4azMX+l/kAU=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "113cd3916682def185290145924fa30b30bda972", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -483,11 +483,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -527,11 +527,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -665,11 +665,11 @@ ] }, "locked": { - "lastModified": 1742206174, - "narHash": "sha256-Fwo/KZl8+OLvm/XcA/6cSvoG2XxHrKNITR08S78pGus=", + "lastModified": 1742239755, + "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c00da36830ae93f200b4a10eae0a56b733616774", + "rev": "787afce414bcce803b605c510b60bf43c11f4b55", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742083780, - "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", + "lastModified": 1742249030, + "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", + "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc", "type": "github" }, "original": { From 0c8d583aca537be01ac0765c0b7e5c09a431b203 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 18 Mar 2025 21:34:07 +0100 Subject: [PATCH 33/60] update toaster to unstable --- flake.lock | 109 ++++++++++------------------------- flake.nix | 15 ++--- modules/basic-tools/nix.nix | 14 ++--- modules/desktop-software.nix | 3 +- modules/devtools.nix | 12 +--- modules/fonts.nix | 7 +-- modules/niri.nix | 7 +-- 7 files changed, 51 insertions(+), 116 deletions(-) diff --git a/flake.lock b/flake.lock index 68e1cc5..25fbc96 100644 --- a/flake.lock +++ b/flake.lock @@ -45,18 +45,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -123,11 +117,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -179,24 +173,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -251,20 +227,19 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742326330, + "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -274,24 +249,23 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_3", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -299,11 +273,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742313775, - "narHash": "sha256-qE8XqkuoWuH2np+NNGGNG8qWN2zPa0ldAM0olaySf+s=", - "rev": "6e6ff5827276ed2c4cf549b9fa898eb1e9566e57", + "lastModified": 1742328220, + "narHash": "sha256-oRRKctwO4s4auyXPQkf8OM94Kuvh678ZL+HGFKnDKuQ=", + "rev": "3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6e6ff5827276ed2c4cf549b9fa898eb1e9566e57.tar.gz?rev=6e6ff5827276ed2c4cf549b9fa898eb1e9566e57" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a.tar.gz?rev=3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a" }, "original": { "type": "tarball", @@ -312,13 +286,13 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": [ "lix" ], "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { @@ -389,7 +363,7 @@ "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", @@ -511,16 +485,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -602,11 +576,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -635,21 +609,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -739,21 +709,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tmux-yank": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1dca929..d355e32 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,8 @@ }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/lanzaboote/v0.4.2"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; authentik-nix = { @@ -37,7 +37,7 @@ lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.lix.follows = "lix"; }; @@ -48,13 +48,13 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; niri = { url = "github:sodiboo/niri-flake/main"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; tmux-yank = { @@ -73,6 +73,7 @@ niri, nixos-hardware, nixpkgs, + nixpkgs-unstable, sops-nix, ... }: @@ -109,7 +110,7 @@ in microvms // { - toaster = nixpkgs.lib.nixosSystem { + toaster = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ diff --git a/modules/basic-tools/nix.nix b/modules/basic-tools/nix.nix index 980ab76..a67c6a8 100644 --- a/modules/basic-tools/nix.nix +++ b/modules/basic-tools/nix.nix @@ -1,7 +1,5 @@ { - lib, pkgs, - inputs, ... }: { @@ -16,14 +14,10 @@ # nix output-monitor environment.systemPackages = [ pkgs.nix-output-monitor ]; - # override default nix shell nixpkgs# behaviour to use current flake lock - nix.registry = - let - flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs; - in - builtins.mapAttrs (_name: v: { flake = v; }) flakes; - - nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs; + nixpkgs.flake = { + setFlakeRegistry = true; + setNixPath = true; + }; nixpkgs.config.allowUnfree = true; } diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 54dcab0..56ee450 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -17,8 +17,9 @@ element-desktop discord mpv - dwarf-fortress-packages.dwarf-fortress-full + # dwarf-fortress-packages.dwarf-fortress-full obs-studio + firefox-wayland ]; programs.steam.enable = true; } diff --git a/modules/devtools.nix b/modules/devtools.nix index 8288862..a003e6e 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -1,8 +1,5 @@ { pkgs, - inputs, - config, - lib, ... }: { @@ -16,11 +13,6 @@ kikit-library ]; }; - - # binwalk v3 on 24.11 - sys_ver = config.system.nixos.release; - unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; - binwalkv3 = if lib.versionOlder "25.05" sys_ver then binwalk else unstablepkgs.binwalk; in [ # general @@ -29,7 +21,7 @@ gef gdb binutils - binwalkv3 + binwalk clang clang-tools direnv @@ -41,7 +33,7 @@ kikit freecad-wayland imhex - python313Full + python3Full nixfmt-rfc-style treefmt android-tools diff --git a/modules/fonts.nix b/modules/fonts.nix index a3516e9..feaee83 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -27,12 +27,7 @@ twitter-color-emoji iosevka-bin cozette - (nerdfonts.override { - fonts = [ - "Hack" - "3270" - ]; - }) + nerd-fonts.hack ]; fonts.enableDefaultPackages = true; diff --git a/modules/niri.nix b/modules/niri.nix index 1a8b59d..0a0afa8 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -1,8 +1,5 @@ # General Desktop-related config { pkgs, inputs, ... }: -let - unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; -in { nixpkgs.overlays = [ inputs.niri.overlays.niri ]; @@ -35,7 +32,7 @@ in bluetui gammastep graphicsmagick - unstablepkgs.i3status-rust + i3status-rust impala kanshi pamixer @@ -46,7 +43,7 @@ in banana-cursor fuzzel alacritty - unstablepkgs.i3bar-river + i3bar-river mako swww oculante From a61336ad852c3795e373ca221426c1bef10bf6f6 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 18 Mar 2025 21:56:41 +0100 Subject: [PATCH 34/60] add xwayland server --- modules/niri.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/niri.nix b/modules/niri.nix index 0a0afa8..95b0079 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -47,6 +47,7 @@ mako swww oculante + xwayland-satellite ]; # Enable sound. From 7772299bdd8b3df2c8690aa74d777d5455f87964 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 19 Mar 2025 13:19:18 +0100 Subject: [PATCH 35/60] cleanup --- modules/desktop-software.nix | 2 +- modules/niri.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 56ee450..70287ff 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -19,7 +19,7 @@ mpv # dwarf-fortress-packages.dwarf-fortress-full obs-studio - firefox-wayland + firefox ]; programs.steam.enable = true; } diff --git a/modules/niri.nix b/modules/niri.nix index 95b0079..ea0870a 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -73,8 +73,6 @@ programs.xwayland.enable = true; - programs.hyprland.enable = true; - environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; }; From 7555207d7beefd1c360bfa3d1aad9962447222bb Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 19 Mar 2025 13:19:25 +0100 Subject: [PATCH 36/60] bump lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 25fbc96..ca5cb12 100644 --- a/flake.lock +++ b/flake.lock @@ -370,11 +370,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742305115, - "narHash": "sha256-EJu/9UNo8ndiZ7AUVTazWQOA4lHUaTkorvgVExo2LLs=", + "lastModified": 1742355568, + "narHash": "sha256-cHW060+beSciKdCK4SZ9vYPOFy/otAq+t9MiO54zKYY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bc4f3a4d3d0fb9be399faf525caffd5b664c5d31", + "rev": "10b56ff2ecc915ec26505526125b4f3a3006d5b3", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1742376361, + "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "type": "github" }, "original": { @@ -517,11 +517,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { From 671d7197883c99591f9cec6231af5ddb937acc87 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 19 Mar 2025 14:00:07 +0100 Subject: [PATCH 37/60] fix xwayland --- modules/niri.nix | 100 ++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 40 deletions(-) diff --git a/modules/niri.nix b/modules/niri.nix index ea0870a..c3438fc 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -9,46 +9,66 @@ ./desktop-software.nix ./fonts.nix ]; - environment.systemPackages = with pkgs; [ - screen-message - qbittorrent - gajim - imv - mpv - evince - brightnessctl - pulsemixer - cmus - termusic - gsettings-desktop-schemas - xdg-utils - qt5.qtwayland - bashmount - audacity - spotify-player - zathura - ncdu - adwaita-icon-theme - bluetui - gammastep - graphicsmagick - i3status-rust - impala - kanshi - pamixer - swayidle - swaylock - wl-clipboard - xfce.thunar - banana-cursor - fuzzel - alacritty - i3bar-river - mako - swww - oculante - xwayland-satellite - ]; + environment.systemPackages = + let + xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs ( + final: prev: { + version = "git"; + cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50="; + src = pkgs.fetchFromGitHub { + owner = "Supreeeme"; + repo = "xwayland-satellite"; + rev = "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc"; + sha256 = "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM="; + }; + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + inherit (final) pname src version; + hash = final.cargoHash; + }; + } + ); + in + with pkgs; + [ + screen-message + qbittorrent + gajim + imv + mpv + evince + brightnessctl + pulsemixer + cmus + termusic + gsettings-desktop-schemas + xdg-utils + qt5.qtwayland + bashmount + audacity + spotify-player + zathura + ncdu + adwaita-icon-theme + bluetui + gammastep + graphicsmagick + i3status-rust + impala + kanshi + pamixer + swayidle + swaylock + wl-clipboard + xfce.thunar + banana-cursor + fuzzel + alacritty + i3bar-river + mako + swww + oculante + xwayland-satellite-git + ]; # Enable sound. security.rtkit.enable = true; From 853e0809cc10c4fc6f01f10c0fb935b165e8c78a Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 22 Mar 2025 15:46:55 +0100 Subject: [PATCH 38/60] bump lock --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index ca5cb12..0573d5d 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1742326330, - "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", + "lastModified": 1742588233, + "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", "owner": "nix-community", "repo": "home-manager", - "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", + "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742328220, - "narHash": "sha256-oRRKctwO4s4auyXPQkf8OM94Kuvh678ZL+HGFKnDKuQ=", - "rev": "3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a", + "lastModified": 1742622332, + "narHash": "sha256-z652gNdFc/95Fheq4DzVObERYRo+j9RdCF6tzkR8r80=", + "rev": "6059cbb031e49e05dd5d16208e2e50d3ab2611db", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a.tar.gz?rev=3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6059cbb031e49e05dd5d16208e2e50d3ab2611db.tar.gz?rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db" }, "original": { "type": "tarball", @@ -370,11 +370,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742355568, - "narHash": "sha256-cHW060+beSciKdCK4SZ9vYPOFy/otAq+t9MiO54zKYY=", + "lastModified": 1742643921, + "narHash": "sha256-tt6FIFIfOHcgKxi6fBD4RxIk3JoYF2WNpVE9jLWT7eI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "10b56ff2ecc915ec26505526125b4f3a3006d5b3", + "rev": "ecd613c125c16295b52bb52f3687c5538b7d95ff", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742276600, - "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=", + "lastModified": 1742641057, + "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", "owner": "YaLTeR", "repo": "niri", - "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a", + "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -457,11 +457,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -501,11 +501,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -517,11 +517,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -635,11 +635,11 @@ ] }, "locked": { - "lastModified": 1742239755, - "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=", + "lastModified": 1742595978, + "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "787afce414bcce803b605c510b60bf43c11f4b55", + "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", "type": "github" }, "original": { @@ -791,11 +791,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742249030, - "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=", + "lastModified": 1742475924, + "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc", + "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", "type": "github" }, "original": { From 0598c3f08df38d29d0941135118df8e4da55b9fc Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Thu, 20 Mar 2025 18:20:20 +0100 Subject: [PATCH 39/60] gnome --- flake.lock | 130 ------------------------ flake.nix | 21 +--- hosts/toaster/network/default.nix | 59 +++-------- hosts/toaster/network/full-networkd.nix | 71 +++++++++++++ 4 files changed, 87 insertions(+), 194 deletions(-) create mode 100644 hosts/toaster/network/full-networkd.nix diff --git a/flake.lock b/flake.lock index 0573d5d..7889ed4 100644 --- a/flake.lock +++ b/flake.lock @@ -224,26 +224,6 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -358,65 +338,6 @@ "type": "github" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": "nixpkgs-stable_2", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1742643921, - "narHash": "sha256-tt6FIFIfOHcgKxi6fBD4RxIk3JoYF2WNpVE9jLWT7eI=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "ecd613c125c16295b52bb52f3687c5538b7d95ff", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "ref": "main", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.02", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1742641057, - "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -499,22 +420,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1742422364, @@ -593,12 +498,10 @@ "inputs": { "authentik-nix": "authentik-nix", "flake-utils": "flake-utils_2", - "home-manager": "home-manager", "lanzaboote": "lanzaboote", "lix": "lix", "lix-module": "lix-module", "microvm": "microvm", - "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -770,39 +673,6 @@ "type": "git", "url": "https://git.oxapentane.com/0xa/website.git" } - }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.5.1", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1742475924, - "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d355e32..47d5d29 100644 --- a/flake.nix +++ b/flake.nix @@ -47,16 +47,6 @@ inputs.flake-utils.follows = "flake-utils"; }; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - - niri = { - url = "github:sodiboo/niri-flake/main"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - tmux-yank = { url = "github:tmux-plugins/tmux-yank"; flake = false; @@ -66,11 +56,9 @@ outputs = inputs@{ authentik-nix, - home-manager, lanzaboote, lix-module, microvm, - niri, nixos-hardware, nixpkgs, nixpkgs-unstable, @@ -118,20 +106,13 @@ lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3 lix-module.nixosModules.default - home-manager.nixosModules.home-manager - niri.nixosModules.niri - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users."0xa" = import ./hosts/toaster/0xa-home.nix; - } ./hosts/toaster ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix - ./modules/niri.nix + ./modules/gnome.nix ./modules/gnupg.nix ./modules/radio.nix ./modules/science.nix diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index ee0bdbe..6d96c3c 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, config, ... }: { imports = [ ./mullvad.nix @@ -6,21 +6,26 @@ ./zw.nix ]; - environment.systemPackages = with pkgs; [ - iwgtk - impala - ]; + # Networkmanager shouldn't interfere with systemd managed interfaces + networking.networkmanager.unmanaged = + let + systemd_netdevs = lib.attrsets.attrValues ( + lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs + ); + in + systemd_netdevs; - # kick out networkmanager - networking.networkmanager.enable = lib.mkForce false; - networking.useNetworkd = true; - systemd.network.enable = true; + systemd.network = { + enable = true; + wait-online.enable = false; # uplink is managed by networkmanager + }; + + users.users."0xa".extraGroups = [ "networkmanager" ]; networking = { hostName = "toaster"; firewall.enable = true; wireguard.enable = true; - wireless.iwd.enable = true; }; services.resolved = { @@ -34,38 +39,4 @@ ]; }; - # we might have no interwebs at all - systemd.network.wait-online.enable = false; - - # uplinks - systemd.network.networks = { - "10-ether-uplink" = { - matchConfig.Name = "enp1s0f0"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; - }; - "10-dock-uplink" = { - matchConfig.Name = "enp5s0f4u1u1"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; - dhcpV4Config = { - RouteMetric = 666; - }; - dhcpV6Config = { - RouteMetric = 666; - }; - }; - "wlan-uplink" = { - matchConfig.Name = "wlan0"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; - }; - }; - } diff --git a/hosts/toaster/network/full-networkd.nix b/hosts/toaster/network/full-networkd.nix new file mode 100644 index 0000000..ee0bdbe --- /dev/null +++ b/hosts/toaster/network/full-networkd.nix @@ -0,0 +1,71 @@ +{ lib, pkgs, ... }: +{ + imports = [ + ./mullvad.nix + ./dumpdvb.nix + ./zw.nix + ]; + + environment.systemPackages = with pkgs; [ + iwgtk + impala + ]; + + # kick out networkmanager + networking.networkmanager.enable = lib.mkForce false; + networking.useNetworkd = true; + systemd.network.enable = true; + + networking = { + hostName = "toaster"; + firewall.enable = true; + wireguard.enable = true; + wireless.iwd.enable = true; + }; + + services.resolved = { + enable = true; + dnssec = "false"; + fallbackDns = [ + "9.9.9.9" + "2620:fe::fe" + "149.112.112.112" + "2620:fe::9" + ]; + }; + + # we might have no interwebs at all + systemd.network.wait-online.enable = false; + + # uplinks + systemd.network.networks = { + "10-ether-uplink" = { + matchConfig.Name = "enp1s0f0"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + "10-dock-uplink" = { + matchConfig.Name = "enp5s0f4u1u1"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + dhcpV4Config = { + RouteMetric = 666; + }; + dhcpV6Config = { + RouteMetric = 666; + }; + }; + "wlan-uplink" = { + matchConfig.Name = "wlan0"; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + }; + +} From c6a62034232c64110fb7eacdf304714b7da860f7 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 23 Mar 2025 15:17:53 +0100 Subject: [PATCH 40/60] software changes --- modules/desktop-software.nix | 1 + modules/fonts.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 70287ff..cbb902e 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -4,6 +4,7 @@ ./chromium.nix ]; environment.systemPackages = with pkgs; [ + audacity blender dino ffmpeg-full diff --git a/modules/fonts.nix b/modules/fonts.nix index feaee83..32ae853 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { fonts.packages = with pkgs; [ + adwaita-fonts monoid font-awesome dejavu_fonts From 747ec4beedd70fb6b6418d6e0e6165665fba701a Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 23 Mar 2025 15:18:01 +0100 Subject: [PATCH 41/60] bump lock --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 7889ed4..828c41e 100644 --- a/flake.lock +++ b/flake.lock @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1741894565, - "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=", - "rev": "a6da43f8193d9e329bba1795c42590c27966082e", + "lastModified": 1742709496, + "narHash": "sha256-6rWA8QlVe3HTCVHyI/gJ5IULyvHkT9d8fMpYC0Kyeh8=", + "rev": "d8e4fee796342636f345e358f33583c8b2fa496e", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a6da43f8193d9e329bba1795c42590c27966082e.tar.gz?rev=a6da43f8193d9e329bba1795c42590c27966082e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d8e4fee796342636f345e358f33583c8b2fa496e.tar.gz?rev=d8e4fee796342636f345e358f33583c8b2fa496e" }, "original": { "type": "tarball", @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1742595978, - "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { From 8ac8d5de44ace61ceccbe2daf92e572924fc6eef Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 24 Mar 2025 18:02:16 +0100 Subject: [PATCH 42/60] bump lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 828c41e..6f5bb51 100644 --- a/flake.lock +++ b/flake.lock @@ -253,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742622332, - "narHash": "sha256-z652gNdFc/95Fheq4DzVObERYRo+j9RdCF6tzkR8r80=", - "rev": "6059cbb031e49e05dd5d16208e2e50d3ab2611db", + "lastModified": 1742834248, + "narHash": "sha256-Vy2AT/R33tX7GihmKsEWoK05HWO/rRKg+EV2WTKcobM=", + "rev": "4181796ed24e4c9c1c9c0d38986880d8c6407e5d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6059cbb031e49e05dd5d16208e2e50d3ab2611db.tar.gz?rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4181796ed24e4c9c1c9c0d38986880d8c6407e5d.tar.gz?rev=4181796ed24e4c9c1c9c0d38986880d8c6407e5d" }, "original": { "type": "tarball", @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742631601, - "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "380ed15bcd6440606c6856db44a99140d422b46f", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { From 1e706281657fd4e6ec7a0fcd0d5128e5fda7710d Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 30 Mar 2025 00:10:32 +0100 Subject: [PATCH 43/60] toaster back to zsh --- hosts/toaster/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix index 17f8f09..b075f6f 100644 --- a/hosts/toaster/default.nix +++ b/hosts/toaster/default.nix @@ -60,7 +60,7 @@ home = "/home/0xa"; isNormalUser = true; uid = 1000; - shell = pkgs.fish; + shell = pkgs.zsh; }; services.emacs.defaultEditor = false; From 28d19492a4f5a49ae26a8d8d281df1064b371a77 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 31 Mar 2025 09:36:34 +0200 Subject: [PATCH 44/60] bump lock --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 6f5bb51..688e051 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1742246110, - "narHash": "sha256-bjJDxW3Z3clNIkgwEktWhFSpU9UyftisDfK3XYzdRps=", + "lastModified": 1743172544, + "narHash": "sha256-I6//hyls5T6Y93IgwbWn5izeT29o+yza4yRgBcmNars=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "04f5e14643b8b37304966767074fbe0efcadab9f", + "rev": "b4916a86d4e650401e67dc03556eadb4a3cb248a", "type": "github" }, "original": { @@ -30,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1742236492, - "narHash": "sha256-Uz7qldS44pxduLcYKf+cCq4WvjoslDR4PwRqivY/4uI=", + "lastModified": 1743169792, + "narHash": "sha256-aaSAlFIc5Gn5PJPVuObi24Y86/3N3yFJVQTx1tV2i2A=", "owner": "goauthentik", "repo": "authentik", - "rev": "3adf79c4939276e108c25c719843b6174e9e22fd", + "rev": "748a8e560f2eb93f7ec15d6762d4e5931fc1fa2a", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.2.2", + "ref": "version/2025.2.3", "repo": "authentik", "type": "github" } @@ -253,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742834248, - "narHash": "sha256-Vy2AT/R33tX7GihmKsEWoK05HWO/rRKg+EV2WTKcobM=", - "rev": "4181796ed24e4c9c1c9c0d38986880d8c6407e5d", + "lastModified": 1743274305, + "narHash": "sha256-gsPA3AAGi3pucRpzJbhWWyyOBv2/2OjAjU/SlcSE8Vc=", + "rev": "d169c092fc28838a253be136d17fe7de1292c728", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4181796ed24e4c9c1c9c0d38986880d8c6407e5d.tar.gz?rev=4181796ed24e4c9c1c9c0d38986880d8c6407e5d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d169c092fc28838a253be136d17fe7de1292c728.tar.gz?rev=d169c092fc28838a253be136d17fe7de1292c728" }, "original": { "type": "tarball", @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1742709496, - "narHash": "sha256-6rWA8QlVe3HTCVHyI/gJ5IULyvHkT9d8fMpYC0Kyeh8=", - "rev": "d8e4fee796342636f345e358f33583c8b2fa496e", + "lastModified": 1742945498, + "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", + "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d8e4fee796342636f345e358f33583c8b2fa496e.tar.gz?rev=d8e4fee796342636f345e358f33583c8b2fa496e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316" }, "original": { "type": "tarball", @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1742700801, - "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", + "lastModified": 1743305778, + "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", + "rev": "8e873886bbfc32163fe027b8676c75637b7da114", "type": "github" }, "original": { From 10c4152f5436a92020869aa272dcf4d5339aac99 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 31 Mar 2025 09:51:55 +0200 Subject: [PATCH 45/60] cleanup --- flake.nix | 1 - hosts/toaster/default.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 47d5d29..53287e4 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,6 @@ ./modules/science.nix ./modules/tlp.nix ./modules/virtualization.nix - ./hosts/toaster/secure-boot.nix ./modules/mail ./modules/wg ]; diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix index b075f6f..17f8f09 100644 --- a/hosts/toaster/default.nix +++ b/hosts/toaster/default.nix @@ -60,7 +60,7 @@ home = "/home/0xa"; isNormalUser = true; uid = 1000; - shell = pkgs.zsh; + shell = pkgs.fish; }; services.emacs.defaultEditor = false; From 1e29764aeef99802536d5b1d7a0d58fa1486b221 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 1 Apr 2025 00:54:23 +0200 Subject: [PATCH 46/60] emacs --- flake.lock | 12 ++++++------ flake.nix | 1 + hosts/toaster/default.nix | 2 -- modules/emacs.nix | 29 +++++++++++++++++++++++++++++ modules/gnome.nix | 2 ++ 5 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 modules/emacs.nix diff --git a/flake.lock b/flake.lock index 688e051..429e69f 100644 --- a/flake.lock +++ b/flake.lock @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 53287e4..0d1fba0 100644 --- a/flake.nix +++ b/flake.nix @@ -118,6 +118,7 @@ ./modules/science.nix ./modules/tlp.nix ./modules/virtualization.nix + ./modules/emacs.nix ./modules/mail ./modules/wg ]; diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix index 17f8f09..1a3216a 100644 --- a/hosts/toaster/default.nix +++ b/hosts/toaster/default.nix @@ -63,8 +63,6 @@ shell = pkgs.fish; }; - services.emacs.defaultEditor = false; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/modules/emacs.nix b/modules/emacs.nix new file mode 100644 index 0000000..705bebd --- /dev/null +++ b/modules/emacs.nix @@ -0,0 +1,29 @@ +{ pkgs, inputs, lib, ... }: + +{ + environment.systemPackages = with pkgs; [ + direnv + ]; + + # nixpkgs.overlays = [ + # inputs.emacs-overlay.overlay + # ]; + + services.emacs = { + install = true; + enable = false; + package = with pkgs; ((emacsPackagesFor (emacs-pgtk.overrideAttrs (old: { + passthru = old.passthru // { + treeSitter = true; + }; + }))).emacsWithPackages (epkgs: with epkgs; [ + # treesitter bits + treesit-grammars.with-all-grammars + + vterm + pdf-tools + ])); + defaultEditor = lib.mkDefault true; + }; + +} diff --git a/modules/gnome.nix b/modules/gnome.nix index 33aeb50..251d8d3 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -8,12 +8,14 @@ environment.systemPackages = with pkgs; [ amberol celluloid + ddcutil gnome-console gnome-obfuscate gnome-boxes gnome-tweaks qbittorrent gnomeExtensions.caffeine + gnomeExtensions.brightness-control-using-ddcutil spotify ghostty fractal From eb4c98a5c848fd1759a0b36a7891ff6f229ab40d Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 1 Apr 2025 11:56:56 +0200 Subject: [PATCH 47/60] cleanup and reformat --- modules/emacs.nix | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/modules/emacs.nix b/modules/emacs.nix index 705bebd..240bd20 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -1,29 +1,35 @@ -{ pkgs, inputs, lib, ... }: +{ + pkgs, + lib, + ... +}: { environment.systemPackages = with pkgs; [ direnv ]; - # nixpkgs.overlays = [ - # inputs.emacs-overlay.overlay - # ]; - services.emacs = { install = true; enable = false; - package = with pkgs; ((emacsPackagesFor (emacs-pgtk.overrideAttrs (old: { - passthru = old.passthru // { - treeSitter = true; - }; - }))).emacsWithPackages (epkgs: with epkgs; [ - # treesitter bits - treesit-grammars.with-all-grammars - - vterm - pdf-tools - ])); + package = + with pkgs; + ( + (emacsPackagesFor ( + emacs-pgtk.overrideAttrs (old: { + passthru = old.passthru // { + treeSitter = true; + }; + }) + )).emacsWithPackages + ( + epkgs: with epkgs; [ + treesit-grammars.with-all-grammars + vterm + pdf-tools + ] + ) + ); defaultEditor = lib.mkDefault true; }; - } From 8d483bdd1d0ad22766dfdc328a4044d155d3b5b2 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 1 Apr 2025 18:16:36 +0200 Subject: [PATCH 48/60] enable ddcutil brigtness control --- hosts/toaster/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix index 1a3216a..7e78114 100644 --- a/hosts/toaster/default.nix +++ b/hosts/toaster/default.nix @@ -46,6 +46,11 @@ supportedLocales = [ "all" ]; }; + # support ddc brigtness control + hardware.i2c.enable = true; + boot.kernelModules = [ "i2c-dev" ]; + environment.systemPackages = [ pkgs.ddcutil ]; + users.users."0xa" = { extraGroups = [ "wheel" @@ -55,6 +60,7 @@ "bluetooth" "libvirtd" "qemu-libvirtd" + "i2c" ]; group = "users"; home = "/home/0xa"; From 9cf9811bc23c10c5b5c23525724c0cd7277f1cbf Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 9 Apr 2025 10:49:11 +0200 Subject: [PATCH 49/60] cleanup --- modules/gnome.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/gnome.nix b/modules/gnome.nix index 251d8d3..f70c270 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -42,12 +42,6 @@ }; }; - qt = { - enable = true; - platformTheme = "gnome"; - style = "adwaita-dark"; - }; - services.xserver = { enable = true; desktopManager.gnome.enable = true; From 08a9b8e4883f931c97fdc5d01d9c4adf1d55fcaf Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 9 Apr 2025 10:49:19 +0200 Subject: [PATCH 50/60] add mu4e --- modules/emacs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/emacs.nix b/modules/emacs.nix index 240bd20..8841e44 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -7,6 +7,7 @@ { environment.systemPackages = with pkgs; [ direnv + mu ]; services.emacs = { @@ -27,6 +28,7 @@ treesit-grammars.with-all-grammars vterm pdf-tools + mu4e ] ) ); From 5af00566a044d7a7c296fbf1722daf6a16954456 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 9 Apr 2025 10:49:26 +0200 Subject: [PATCH 51/60] bump lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 429e69f..391962b 100644 --- a/flake.lock +++ b/flake.lock @@ -253,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1743274305, - "narHash": "sha256-gsPA3AAGi3pucRpzJbhWWyyOBv2/2OjAjU/SlcSE8Vc=", - "rev": "d169c092fc28838a253be136d17fe7de1292c728", + "lastModified": 1744100513, + "narHash": "sha256-eDym7mHXW0AVuqhp5BZ7uBk5b5NcM4slnSXFuoAUadc=", + "rev": "fb0ef6ca6bfea368e594e9ae2714858030f66bc6", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d169c092fc28838a253be136d17fe7de1292c728.tar.gz?rev=d169c092fc28838a253be136d17fe7de1292c728" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fb0ef6ca6bfea368e594e9ae2714858030f66bc6.tar.gz?rev=fb0ef6ca6bfea368e594e9ae2714858030f66bc6" }, "original": { "type": "tarball", @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1743305778, - "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", + "lastModified": 1744103455, + "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e873886bbfc32163fe027b8676c75637b7da114", + "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", "type": "github" }, "original": { From 8842853c433ed10ebcd95bacb53e4bd1f8326707 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 19 Apr 2025 21:12:51 +0200 Subject: [PATCH 52/60] bump lock --- flake.lock | 73 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 391962b..a6eb837 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1743172544, - "narHash": "sha256-I6//hyls5T6Y93IgwbWn5izeT29o+yza4yRgBcmNars=", + "lastModified": 1744375272, + "narHash": "sha256-xvWbdTctLu5YWgcp+lNTh51GAY3vB2XEXUFKRMJUiCM=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "b4916a86d4e650401e67dc03556eadb4a3cb248a", + "rev": "105b3b6c004ce00d1d3c7a88669bea4aadfd4580", "type": "github" }, "original": { @@ -30,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1743169792, - "narHash": "sha256-aaSAlFIc5Gn5PJPVuObi24Y86/3N3yFJVQTx1tV2i2A=", + "lastModified": 1744135136, + "narHash": "sha256-7wvoCRhLipX4qzrb/ctsozG565yckx+moxiF6vRo84I=", "owner": "goauthentik", "repo": "authentik", - "rev": "748a8e560f2eb93f7ec15d6762d4e5931fc1fa2a", + "rev": "74eab55c615b156e4191ee98dc789e2d58c016f9", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.2.3", + "ref": "version/2025.2.4", "repo": "authentik", "type": "github" } @@ -96,11 +96,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1744100513, - "narHash": "sha256-eDym7mHXW0AVuqhp5BZ7uBk5b5NcM4slnSXFuoAUadc=", - "rev": "fb0ef6ca6bfea368e594e9ae2714858030f66bc6", + "lastModified": 1744302352, + "narHash": "sha256-QJQecf/Z1rLZBpVoQaI+EunLX5U7c7uYGER5iw00YrI=", + "rev": "81d476984901d1f00fdcac36a0a8f06cb54048f6", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fb0ef6ca6bfea368e594e9ae2714858030f66bc6.tar.gz?rev=fb0ef6ca6bfea368e594e9ae2714858030f66bc6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/81d476984901d1f00fdcac36a0a8f06cb54048f6.tar.gz?rev=81d476984901d1f00fdcac36a0a8f06cb54048f6" }, "original": { "type": "tarball", @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -394,14 +394,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { @@ -422,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -454,11 +457,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739883580, - "narHash": "sha256-3ydikhrNaWy8j0cqHju/94PcD4GZ9T4Ju4rHh34oz3k=", + "lastModified": 1743690424, + "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d90f9db68a4bda31c346be16dfd8d3263be4547e", + "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94", "type": "github" }, "original": { @@ -538,11 +541,11 @@ ] }, "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", + "lastModified": 1744669848, + "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", + "rev": "61154300d945f0b147b30d24ddcafa159148026a", "type": "github" }, "original": { From 30a19da945702c166d1da5327b765043d82b91d1 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 2 May 2025 14:03:56 +0200 Subject: [PATCH 53/60] bump lock --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index a6eb837..97eb2bf 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1744375272, - "narHash": "sha256-xvWbdTctLu5YWgcp+lNTh51GAY3vB2XEXUFKRMJUiCM=", + "lastModified": 1745851830, + "narHash": "sha256-DHVRLCKoJYrysppygOZrmg6UngrlTN+M4t8HaOiQQfU=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "105b3b6c004ce00d1d3c7a88669bea4aadfd4580", + "rev": "618330bee6b5e284499b5f85b74cbdfe6f873d6e", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1744302352, - "narHash": "sha256-QJQecf/Z1rLZBpVoQaI+EunLX5U7c7uYGER5iw00YrI=", - "rev": "81d476984901d1f00fdcac36a0a8f06cb54048f6", + "lastModified": 1746186329, + "narHash": "sha256-MLz0MjeVCaqvIvf5szUwNwYEiXC/lKWL0I2VS+6V/e0=", + "rev": "4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/81d476984901d1f00fdcac36a0a8f06cb54048f6.tar.gz?rev=81d476984901d1f00fdcac36a0a8f06cb54048f6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f.tar.gz?rev=4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f" }, "original": { "type": "tarball", @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { From e96943305796328748de754dcdbf32d191f464ef Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 2 May 2025 14:16:29 +0200 Subject: [PATCH 54/60] authentik: use vendored nixpkgs --- flake.lock | 30 ++++++++++++++++++++++-------- flake.nix | 1 - 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 97eb2bf..4f9bb83 100644 --- a/flake.lock +++ b/flake.lock @@ -7,9 +7,7 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "napalm": "napalm", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "poetry2nix": "poetry2nix", "systems": "systems" }, @@ -378,16 +376,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -439,6 +437,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -506,7 +520,7 @@ "lix-module": "lix-module", "microvm": "microvm", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "tmux-yank": "tmux-yank", diff --git a/flake.nix b/flake.nix index 0d1fba0..031e368 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ authentik-nix = { url = "github:nix-community/authentik-nix"; - inputs.nixpkgs.follows = "nixpkgs"; }; lix = { From 6b954bb4c3365426f1ee73d419b4266367e51242 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 2 May 2025 14:22:35 +0200 Subject: [PATCH 55/60] sdrangel is broken --- modules/radio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/radio.nix b/modules/radio.nix index 391e98b..aea167c 100644 --- a/modules/radio.nix +++ b/modules/radio.nix @@ -5,7 +5,7 @@ gnuradio gqrx cubicsdr - sdrangel + # sdrangel # broken package multimon-ng sox From 101a1be65fcf6af201e0f4e4a1f8d1c6f9ebb97a Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 13 May 2025 11:19:02 +0200 Subject: [PATCH 56/60] bump lock --- flake.lock | 190 +++++++++++++++++++++++++++-------------------------- 1 file changed, 96 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index 4f9bb83..dbbb05c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,15 +8,17 @@ "flake-utils": "flake-utils", "napalm": "napalm", "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix", - "systems": "systems" + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix", + "systems": "systems", + "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1745851830, - "narHash": "sha256-DHVRLCKoJYrysppygOZrmg6UngrlTN+M4t8HaOiQQfU=", + "lastModified": 1746874492, + "narHash": "sha256-Gm2Eb5KBxAL6y9WJj7phRMXNAZzVkKlm9Dky9WDZHtQ=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "618330bee6b5e284499b5f85b74cbdfe6f873d6e", + "rev": "2ef24fac993808a1a57f367ef58ac0f5254c3489", "type": "github" }, "original": { @@ -28,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1744135136, - "narHash": "sha256-7wvoCRhLipX4qzrb/ctsozG565yckx+moxiF6vRo84I=", + "lastModified": 1745954192, + "narHash": "sha256-QuIgeu3CN6S44/zSiaj+iIkDz2494mb1MWvD3eYYkVE=", "owner": "goauthentik", "repo": "authentik", - "rev": "74eab55c615b156e4191ee98dc789e2d58c016f9", + "rev": "22412729e2379d645da2ac0c0270a0ac6147945e", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.2.4", + "ref": "version/2025.4.0", "repo": "authentik", "type": "github" } @@ -251,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1746186329, - "narHash": "sha256-MLz0MjeVCaqvIvf5szUwNwYEiXC/lKWL0I2VS+6V/e0=", - "rev": "4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f", + "lastModified": 1747090068, + "narHash": "sha256-4SfKg7DUMKf+iKuqwMhq+a9hXck5eB5uapIVM50hpts=", + "rev": "901940df00665457005af20281f090de77420fe2", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f.tar.gz?rev=4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/901940df00665457005af20281f090de77420fe2.tar.gz?rev=901940df00665457005af20281f090de77420fe2" }, "original": { "type": "tarball", @@ -274,11 +276,11 @@ ] }, "locked": { - "lastModified": 1742945498, - "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", - "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", + "lastModified": 1746839253, + "narHash": "sha256-pRwi8Wn8Yofj459gq+3oIRy8F3SXeEJ6mzfIAUgM9nA=", + "rev": "58baedd53f9da81fd728a4f3b08c378e5ba9ae58", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/58baedd53f9da81fd728a4f3b08c378e5ba9ae58.tar.gz?rev=58baedd53f9da81fd728a4f3b08c378e5ba9ae58" }, "original": { "type": "tarball", @@ -336,35 +338,13 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "authentik-nix", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729742964, - "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1747083103, + "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", "type": "github" }, "original": { @@ -376,11 +356,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -423,11 +403,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -439,11 +419,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -453,37 +433,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "authentik-nix", - "flake-utils" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "authentik-nix", - "nixpkgs" - ], - "systems": [ - "authentik-nix", - "systems" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1743690424, - "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -511,6 +460,56 @@ "type": "github" } }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "authentik-nix", + "nixpkgs" + ], + "pyproject-nix": [ + "authentik-nix", + "pyproject-nix" + ], + "uv2nix": [ + "authentik-nix", + "uv2nix" + ] + }, + "locked": { + "lastModified": 1744599653, + "narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "7dba6dbc73120e15b558754c26024f6c93015dd7", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "authentik-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746146146, + "narHash": "sha256-60+mzI2lbgn+G8F5mz+cmkDvHFn4s5oqcOna1SzYy74=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "3e9623bdd86a3c545e82b7f97cfdba5f07232d9a", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "authentik-nix": "authentik-nix", @@ -555,11 +554,11 @@ ] }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -645,25 +644,28 @@ "type": "github" } }, - "treefmt-nix": { + "uv2nix": { "inputs": { "nixpkgs": [ "authentik-nix", - "poetry2nix", "nixpkgs" + ], + "pyproject-nix": [ + "authentik-nix", + "pyproject-nix" ] }, "locked": { - "lastModified": 1730120726, - "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", + "lastModified": 1746048139, + "narHash": "sha256-LdCLyiihLg6P2/mjzP0+W7RtraDSIaJJPTy6SCtW5Ag=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "680e2f8e637bc79b84268949d2f2b2f5e5f1d81c", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "pyproject-nix", + "repo": "uv2nix", "type": "github" } }, From 0dace854c13d3a2460643c22970a5cded78a30c9 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 13 May 2025 16:46:02 +0200 Subject: [PATCH 57/60] update microvm --- flake.lock | 15 +++++++-------- flake.nix | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index dbbb05c..68a11c3 100644 --- a/flake.lock +++ b/flake.lock @@ -298,16 +298,15 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1712366957, - "narHash": "sha256-7W3D1Gk6mGlwtV07n6YB/7s3tThcBYknlvDPcoJJSe4=", + "lastModified": 1747016581, + "narHash": "sha256-iQrEuBs23Cd+bSfcY85GLykHP0vmGrkVfMwUlzvqMQQ=", "owner": "astro", "repo": "microvm.nix", - "rev": "1e746a8987eb893adc8dd317b84e73d72803b650", + "rev": "5aff25e6e861e7d96ce10452ca976c16d073cf16", "type": "github" }, "original": { "owner": "astro", - "ref": "v0.5.0", "repo": "microvm.nix", "type": "github" } @@ -570,11 +569,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1708358594, - "narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=", + "lastModified": 1746869549, + "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=", "ref": "refs/heads/main", - "rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c", - "revCount": 614, + "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87", + "revCount": 862, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, diff --git a/flake.nix b/flake.nix index 031e368..072d6ab 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; microvm = { - url = "github:astro/microvm.nix/v0.5.0"; + url = "github:astro/microvm.nix"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; From 37009c4a7ca2b78ffe081dc8683805891d583ef7 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 13 May 2025 17:01:53 +0200 Subject: [PATCH 58/60] update authentik and immich to unstable --- flake.nix | 20 ++++++++++++-------- hosts/immich/immich.nix | 6 ------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 072d6ab..8672d2d 100644 --- a/flake.nix +++ b/flake.nix @@ -68,19 +68,21 @@ { nixosConfigurations = let - microvm-list = [ - "auth" + microvm-stable-list = [ "conduwuit" "forgejo" - "immich" "miniflux" "radicale" ]; + microvm-unstable-list = [ + "auth" + "immich" + ]; - microvms = builtins.listToAttrs ( + microvm-builder = (nixpkgs-ver: vm-list: builtins.listToAttrs ( map (vm: { name = vm; - value = nixpkgs.lib.nixosSystem { + value = nixpkgs-ver.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ @@ -92,8 +94,10 @@ ./modules/wg ]; }; - }) microvm-list - ); + }) vm-list + )); + microvms = (microvm-builder nixpkgs microvm-stable-list) + // (microvm-builder nixpkgs-unstable microvm-unstable-list); in microvms // { @@ -152,7 +156,7 @@ ./modules/wg { - config.microvm.autostart = microvm-list; + config.microvm.autostart = microvm-stable-list ++ microvm-unstable-list; } ]; }; diff --git a/hosts/immich/immich.nix b/hosts/immich/immich.nix index 40243ae..11a69b6 100644 --- a/hosts/immich/immich.nix +++ b/hosts/immich/immich.nix @@ -1,12 +1,7 @@ { config, - inputs, - pkgs, ... }: -let - immich-latest = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.immich; -in { sops.secrets."immich.yaml" = { sopsFile = ./immich.yaml; @@ -16,7 +11,6 @@ in services.immich = { enable = true; - package = immich-latest; host = "10.89.88.13"; redis.enable = true; database.createDB = true; From da105dc615310e457c7d80207e57931ad2ee95f9 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 13 May 2025 17:07:19 +0200 Subject: [PATCH 59/60] update ballooning option --- hosts/forgejo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/forgejo/default.nix b/hosts/forgejo/default.nix index 5e02678..f6de473 100644 --- a/hosts/forgejo/default.nix +++ b/hosts/forgejo/default.nix @@ -18,7 +18,7 @@ in microvm = { hypervisor = "qemu"; mem = 3 * 1024; - balloonMem = 4 * 1024; + balloon = true; vcpu = 4; interfaces = [ { From 799f4563b0663eaa6522bb07da0ea5b8f826812e Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Fri, 16 May 2025 12:16:38 +0200 Subject: [PATCH 60/60] bump lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 68a11c3..447dfa1 100644 --- a/flake.lock +++ b/flake.lock @@ -253,11 +253,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1747090068, - "narHash": "sha256-4SfKg7DUMKf+iKuqwMhq+a9hXck5eB5uapIVM50hpts=", - "rev": "901940df00665457005af20281f090de77420fe2", + "lastModified": 1747347117, + "narHash": "sha256-wsPOuwczt+kJ4vuf3mm6uMv4wnfWP/RNV5Cp/P5nqQw=", + "rev": "3f355b8fd1ffbe670d756bcf976a38cbe80bb77b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/901940df00665457005af20281f090de77420fe2.tar.gz?rev=901940df00665457005af20281f090de77420fe2" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3f355b8fd1ffbe670d756bcf976a38cbe80bb77b.tar.gz?rev=3f355b8fd1ffbe670d756bcf976a38cbe80bb77b" }, "original": { "type": "tarball", @@ -339,11 +339,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747083103, - "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -402,11 +402,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -418,11 +418,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747209494, + "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "github" }, "original": {