From 358c9f046857b971f7a248473b365e2a3e9159b3 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Mon, 24 Feb 2025 14:23:45 -0600 Subject: [PATCH 1/3] Add gjs and gnome-tweaks. --- hosts/flynode/default.nix | 3 +-- roles/gnome.nix | 3 ++- roles/gui.nix | 1 - roles/mate.nix | 1 - roles/{laptop.nix => tlp.nix} | 0 users/nolan/desktop.nix | 1 + 6 files changed, 4 insertions(+), 5 deletions(-) rename roles/{laptop.nix => tlp.nix} (100%) diff --git a/hosts/flynode/default.nix b/hosts/flynode/default.nix index 7ff9cda..555a992 100644 --- a/hosts/flynode/default.nix +++ b/hosts/flynode/default.nix @@ -5,7 +5,6 @@ { imports = [ ./hardware-configuration.nix - ../../roles/laptop.nix ../../roles/zfs.nix ../../base.nix ../../users/root.nix @@ -15,7 +14,7 @@ ../../roles/nix-ld.nix ../../roles/tailscale.nix ../../roles/podman.nix - ../../roles/mate.nix + ../../roles/gnome.nix ../../roles/flatpak.nix ../../roles/games.nix ]; diff --git a/roles/gnome.nix b/roles/gnome.nix index 5fcf467..634f2ff 100644 --- a/roles/gnome.nix +++ b/roles/gnome.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - imports = [ ./gui.nix ]; @@ -16,4 +15,6 @@ gnome-console gnome-tour ]; + + environment.systemPackages = with pkgs; [ gnome-tweaks ]; } diff --git a/roles/gui.nix b/roles/gui.nix index ee1f73e..ddec6dc 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - imports = [ ./pipewire.nix ./non-virtual.nix diff --git a/roles/mate.nix b/roles/mate.nix index 2e376fc..11fd8d7 100644 --- a/roles/mate.nix +++ b/roles/mate.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - imports = [ ./gui.nix ]; diff --git a/roles/laptop.nix b/roles/tlp.nix similarity index 100% rename from roles/laptop.nix rename to roles/tlp.nix diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix index 19435b6..d12585b 100644 --- a/users/nolan/desktop.nix +++ b/users/nolan/desktop.nix @@ -8,6 +8,7 @@ keepassxc podman-desktop devpod + gjs unstable.fractal element-desktop discord From 1d0cbcd92cea0432ce424934e519fece6f47ad5f Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Mon, 24 Feb 2025 14:24:51 -0600 Subject: [PATCH 2/3] No longer planning to use git-crypt. --- base.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/base.nix b/base.nix index f4bb7d6..386dd51 100644 --- a/base.nix +++ b/base.nix @@ -12,7 +12,6 @@ curl wget git - git-crypt tmux psmisc ]; From b3c9c2bf03189e7dce2ca1b3b6fa799256ad427c Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Mon, 24 Feb 2025 14:28:00 -0600 Subject: [PATCH 3/3] Add AppImage support. --- base.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/base.nix b/base.nix index 386dd51..4526a0b 100644 --- a/base.nix +++ b/base.nix @@ -17,4 +17,13 @@ ]; environment.variables.EDITOR = "vim"; + + boot.binfmt.registrations.appimage = { + wrapInterpreterInShell = false; + interpreter = "${pkgs.appimage-run}/bin/appimage-run"; + recognitionType = "magic"; + offset = 0; + mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; + magicOrExtension = ''\x7fELF....AI\x02''; + }; }