From 692a782a29e239610e15c114ca02b0290eff19e2 Mon Sep 17 00:00:00 2001 From: Lauren Lagarde Date: Thu, 13 Mar 2025 22:29:22 -0500 Subject: [PATCH] Refactor; add wine, polkit, and failed attempt at swapfile hibernation --- .gitmodules | 6 +++--- features/gpu/intel.nix | 2 ++ features/i3wm.nix | 14 ++++++++++++++ flake.lock | 12 ++++++------ flake.nix | 8 ++++---- systems/ll-latitude-e5591.nix | 6 ++++++ users/lauren_lagarde/dotspace.nix | 7 ------- users/lauren_lagarde/dotspace_gui.nix | 7 ------- users/lauren_lagarde/home-manager | 1 - users/lauren_lagarde/home-manager.nix | 7 ------- users/lauren_lagarde/i3.nix | 9 --------- 11 files changed, 35 insertions(+), 44 deletions(-) delete mode 100644 users/lauren_lagarde/dotspace.nix delete mode 100644 users/lauren_lagarde/dotspace_gui.nix delete mode 160000 users/lauren_lagarde/home-manager delete mode 100644 users/lauren_lagarde/home-manager.nix delete mode 100644 users/lauren_lagarde/i3.nix diff --git a/.gitmodules b/.gitmodules index 57fa4f7..f50b9ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "users/lauren_lagarde/home-manager"] - path = users/lauren_lagarde/home-manager - url = https://git.mlaga97.space/mlaga97/home-manager.git +[submodule "modules/mlaga97-home-manager"] + path = modules/mlaga97-home-manager + url = https://git.mlaga97.space/mlaga97/home-manager diff --git a/features/gpu/intel.nix b/features/gpu/intel.nix index b888ac3..a6f89b8 100644 --- a/features/gpu/intel.nix +++ b/features/gpu/intel.nix @@ -1,4 +1,6 @@ { pkgs, ... }: { + hardware.graphics.enable32Bit = true; + nixpkgs.config.packageOverrides = pkgs: { intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; diff --git a/features/i3wm.nix b/features/i3wm.nix index b834c0b..cfe8d12 100644 --- a/features/i3wm.nix +++ b/features/i3wm.nix @@ -15,4 +15,18 @@ }; services.displayManager.defaultSession = "none+i3"; + + systemd.user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; } diff --git a/flake.lock b/flake.lock index aa8d9dc..1569b3a 100644 --- a/flake.lock +++ b/flake.lock @@ -76,7 +76,7 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "ll-home-manager", + "mlaga97-home-manager", "nixpkgs" ] }, @@ -130,7 +130,7 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" } }, - "ll-home-manager": { + "mlaga97-home-manager": { "inputs": { "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_2", @@ -138,12 +138,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-tEq3iB8LaBpgig/fDrM9uvcMkoyKj8nghUAcqa1vxe8=", - "path": "/nix/store/wxpfil70w1hsbhzk4wh4smwhbwbqlwlh-source/users/lauren_lagarde/home-manager", + "narHash": "sha256-oKpqiYEEMrno6/Cx7kk3FSIeshwyhmm29jppwTEcbMY=", + "path": "/nix/store/4nfp193ifb272bqfln8bwi788vkqs0p5-source/modules/mlaga97-home-manager", "type": "path" }, "original": { - "path": "/nix/store/wxpfil70w1hsbhzk4wh4smwhbwbqlwlh-source/users/lauren_lagarde/home-manager", + "path": "/nix/store/4nfp193ifb272bqfln8bwi788vkqs0p5-source/modules/mlaga97-home-manager", "type": "path" } }, @@ -281,7 +281,7 @@ "disko": "disko", "home-manager": "home-manager", "lix-module": "lix-module", - "ll-home-manager": "ll-home-manager", + "mlaga97-home-manager": "mlaga97-home-manager", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable_2", diff --git a/flake.nix b/flake.nix index c530348..783f1e3 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - ll-home-manager.url = "./users/lauren_lagarde/home-manager/"; + mlaga97-home-manager.url = "./modules/mlaga97-home-manager/"; # Extras waveforms.url = "github:liff/waveforms-flake"; @@ -131,7 +131,7 @@ { networking.hostName = "ll-nixos-base"; home-manager.users."lauren_lagarde" = { config, ... }: { - imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; + imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; }; } ./systems/ll-nixos-base.nix @@ -210,7 +210,7 @@ { networking.hostName = "ll-nixos"; home-manager.users."lauren_lagarde" = { config, ... }: { - imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; + imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; }; } ./systems/ll-nixos-base.nix @@ -227,7 +227,7 @@ { networking.hostName = "ll-nixos"; home-manager.users."lauren_lagarde" = { config, ... }: { - imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; + imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; }; } ./systems/ll-nixos-full.nix diff --git a/systems/ll-latitude-e5591.nix b/systems/ll-latitude-e5591.nix index 0a44ae3..f2c90c8 100644 --- a/systems/ll-latitude-e5591.nix +++ b/systems/ll-latitude-e5591.nix @@ -45,6 +45,12 @@ "i915.enable_guc=2" ]; + # TODO: Not quite enough for hibernation while zram is still enabled + #swapDevices = [{ + # device = "/var/lib/swapfile"; + # size = 48 * 1024; + #}]; + ############################################################################## ############################################################################## ############################################################################## diff --git a/users/lauren_lagarde/dotspace.nix b/users/lauren_lagarde/dotspace.nix deleted file mode 100644 index b432937..0000000 --- a/users/lauren_lagarde/dotspace.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, unstable, ... }: { - home-manager.users.lauren_lagarde = { - imports = [ - ./home-manager/secrets/dotspace.nix - ]; - }; -} diff --git a/users/lauren_lagarde/dotspace_gui.nix b/users/lauren_lagarde/dotspace_gui.nix deleted file mode 100644 index be89129..0000000 --- a/users/lauren_lagarde/dotspace_gui.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, unstable, ... }: { - home-manager.users.lauren_lagarde = { - imports = [ - ./home-manager/secrets/dotspace_gui.nix - ]; - }; -} diff --git a/users/lauren_lagarde/home-manager b/users/lauren_lagarde/home-manager deleted file mode 160000 index 2d878c3..0000000 --- a/users/lauren_lagarde/home-manager +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d878c34486115db6573e2da995e1572e36cd8ee diff --git a/users/lauren_lagarde/home-manager.nix b/users/lauren_lagarde/home-manager.nix deleted file mode 100644 index d6181f2..0000000 --- a/users/lauren_lagarde/home-manager.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, unstable, ... }: { - home-manager.users.lauren_lagarde = { - imports = [ - ./home-manager/lauren_lagarde.nix - ]; - }; -} diff --git a/users/lauren_lagarde/i3.nix b/users/lauren_lagarde/i3.nix deleted file mode 100644 index d149677..0000000 --- a/users/lauren_lagarde/i3.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ home-manager, unstable, ... }: { - home-manager.extraSpecialArgs = { - inherit unstable; - }; - - home-manager.users.lauren_lagarde.imports = [ - ./home-manager/i3.nix - ]; -}