aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock91
-rw-r--r--modules/home/apps/steam/default.nix1
-rw-r--r--modules/home/impermanence/default.nix8
-rw-r--r--modules/nixos/system/impermanence/default.nix12
-rw-r--r--overlays/openrgb/default.nix9
-rw-r--r--overlays/openrgb/g733.patch23
-rw-r--r--systems/x86_64-linux/copenhagen/default.nix7
7 files changed, 76 insertions, 75 deletions
diff --git a/flake.lock b/flake.lock
index 2751e66..a85b84a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "lastModified": 1747046372,
+ "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@@ -115,11 +115,32 @@
]
},
"locked": {
- "lastModified": 1767104570,
- "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
+ "lastModified": 1769015285,
+ "narHash": "sha256-MlqzCJbckJsgwfkRs64H2xaX2Uxl4o6Z9XYfkYS1N/E=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
+ "rev": "ec0247a7a19f641595c24ac1ea4df6461d1cdb36",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "home-manager_2": {
+ "inputs": {
+ "nixpkgs": [
+ "impermanence",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1768598210,
+ "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
"type": "github"
},
"original": {
@@ -129,12 +150,16 @@
}
},
"impermanence": {
+ "inputs": {
+ "home-manager": "home-manager_2",
+ "nixpkgs": "nixpkgs"
+ },
"locked": {
- "lastModified": 1737831083,
- "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+ "lastModified": 1768941735,
+ "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+ "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54",
"type": "github"
},
"original": {
@@ -167,29 +192,29 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1745459915,
- "narHash": "sha256-98cnDz6QiQhgx48OrNomrMnKZL+cfihFDYAzhDg0MVE=",
- "owner": "CartConnoisseur",
+ "lastModified": 1768962252,
+ "narHash": "sha256-HyWOOHcySV8rl36gs4+n0sxPinxpwWOgwXibfFPYeZ0=",
+ "owner": "Infinidoge",
"repo": "nix-minecraft",
- "rev": "f6f2c8849abea259af2749b65a9bcf86f90aa0d5",
+ "rev": "433cf697394104123e1fd02fa689534ac1733bfa",
"type": "github"
},
"original": {
- "owner": "CartConnoisseur",
+ "owner": "Infinidoge",
"repo": "nix-minecraft",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1742889210,
- "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+ "lastModified": 1768564909,
+ "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+ "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github"
},
"original": {
@@ -201,11 +226,27 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1766902085,
- "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+ "lastModified": 1748929857,
+ "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1768886240,
+ "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+ "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0",
"type": "github"
},
"original": {
@@ -224,11 +265,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1767136206,
- "narHash": "sha256-gid5LbLQRHuexlvSgH6ibeSBV0T/QjkuVRXPr+r/kTo=",
+ "lastModified": 1768910181,
+ "narHash": "sha256-YRU0IHMzXluZxr0JDfq9jtblb4DV7MIB5wj2jYMFKQc=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "33e1f1d4446472d9e3526ff21c47a95a9814cdfe",
+ "rev": "5b138edcb2f1c3ed4b29eca3658f04f0639b98b3",
"type": "github"
},
"original": {
@@ -243,7 +284,7 @@
"impermanence": "impermanence",
"k95aux": "k95aux",
"nix-minecraft": "nix-minecraft",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"nixvim": "nixvim",
"snowfall-lib": "snowfall-lib"
}
diff --git a/modules/home/apps/steam/default.nix b/modules/home/apps/steam/default.nix
index 9148b9d..0082033 100644
--- a/modules/home/apps/steam/default.nix
+++ b/modules/home/apps/steam/default.nix
@@ -17,7 +17,6 @@ in {
home.persistence.${impermanence.location} = {
directories = [{
directory = ".local/share/Steam";
- method = "symlink";
}];
};
diff --git a/modules/home/impermanence/default.nix b/modules/home/impermanence/default.nix
index b4b4630..540a6b5 100644
--- a/modules/home/impermanence/default.nix
+++ b/modules/home/impermanence/default.nix
@@ -4,10 +4,6 @@ with lib; with lib.${namespace}; let
cfg = config.${namespace}.impermanence;
os = osConfig.${namespace}.system.impermanence.home;
in {
- imports = [
- inputs.impermanence.nixosModules.home-manager.impermanence
- ];
-
options.${namespace}.impermanence = with types; {
skeleton = mkOption {
type = bool;
@@ -26,8 +22,6 @@ in {
home.persistence.${cfg.location} = {
enable = cfg.enable;
- allowOther = true;
-
directories = mkIf cfg.skeleton [
".local/share/applications"
".local/bin"
@@ -45,8 +39,6 @@ in {
home.persistence.${cfg.secure.location} = {
enable = cfg.enable;
- allowOther = false;
-
directories = mkIf cfg.skeleton [
"Secure"
];
diff --git a/modules/nixos/system/impermanence/default.nix b/modules/nixos/system/impermanence/default.nix
index b82579b..ecbf720 100644
--- a/modules/nixos/system/impermanence/default.nix
+++ b/modules/nixos/system/impermanence/default.nix
@@ -11,18 +11,24 @@ in {
default = "/persist/system";
};
- #TODO: multi-user support
home = {
enable = mkEnableOption "home impermanence";
+ # in a completely undocumented and non-overridable change (yes im a little upset),
+ # home impermanence moved from the location provided to the location provided + $HOME.
+ # forcing me to move all my shit is NOT cool. dont remove user choice for no reason.
+ # especially not in a breaking change, and ESPECIALLY not an *UNDOCUMENTED ONE!*
+
+ # anyways, now home is at just /persist while system is in a subdir. because that
+ # makes sense. actual persist path = /persist/home/c
location = mkOption {
type = str;
- default = "/persist/home";
+ default = "/persist";
};
secure.location = mkOption {
type = str;
- default = "/persist/secure/home";
+ default = "/persist/secure";
};
};
};
diff --git a/overlays/openrgb/default.nix b/overlays/openrgb/default.nix
deleted file mode 100644
index 0e070a7..0000000
--- a/overlays/openrgb/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-final: prev: {
- openrgb = prev.openrgb.overrideAttrs (old: {
- patches = [
- ./g733.patch
- ] ++ prev.openrgb.patches;
- });
-}
diff --git a/overlays/openrgb/g733.patch b/overlays/openrgb/g733.patch
deleted file mode 100644
index c8b8f99..0000000
--- a/overlays/openrgb/g733.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp
-index 674e706c..2b9010ee 100644
---- a/Controllers/LogitechController/LogitechControllerDetect.cpp
-+++ b/Controllers/LogitechController/LogitechControllerDetect.cpp
-@@ -99,6 +99,8 @@ using namespace std::chrono_literals;
- #define LOGITECH_G933_PID 0x0A5B
- #define LOGITECH_G935_PID 0x0A87
- #define LOGITECH_G733_PID 0x0AB5
-+#define LOGITECH_G733_2_PID 0x0AFE
-+#define LOGITECH_G733_3_PID 0x0B1F
- #define LOGITECH_G633_PID 0X0A5C
-
- /*-----------------------------------------------------*\
-@@ -914,4 +916,6 @@ REGISTER_HID_DETECTOR_IPU("Logitech G903 Hero Wireless Gaming Mouse (wired)",
- REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_PID, 2, 0xFF00, 2);
- REGISTER_HID_DETECTOR_IPU("Logitech G633 Gaming Headset", DetectLogitechWired, LOGITECH_VID, LOGITECH_G633_PID, 3, 0xFF43, 514);
- REGISTER_HID_DETECTOR_IPU("Logitech G733 Gaming Headset", DetectLogitechWired, LOGITECH_VID, LOGITECH_G733_PID, 3, 0xFF43, 514);
-+REGISTER_HID_DETECTOR_IPU("Logitech G733 Gaming Headset", DetectLogitechWired, LOGITECH_VID, LOGITECH_G733_2_PID, 3, 0xFF43, 514);
-+REGISTER_HID_DETECTOR_IPU("Logitech G733 Gaming Headset", DetectLogitechWired, LOGITECH_VID, LOGITECH_G733_3_PID, 3, 0xFF43, 514);
- REGISTER_HID_DETECTOR_IPU("Logitech G935 Gaming Headset", DetectLogitechWired, LOGITECH_VID, LOGITECH_G935_PID, 3, 0xFF43, 514);
---
-2.51.2
-
diff --git a/systems/x86_64-linux/copenhagen/default.nix b/systems/x86_64-linux/copenhagen/default.nix
index fffc729..f6b4037 100644
--- a/systems/x86_64-linux/copenhagen/default.nix
+++ b/systems/x86_64-linux/copenhagen/default.nix
@@ -65,12 +65,7 @@ with lib; with lib.${namespace}; {
home.config = {
cxl = {
- impermanence = {
- skeleton = false;
- location = lib.mkForce "/persist/home/c";
- secure.location = lib.mkForce "/persist/secure/home/c";
- };
-
+ impermanence.skeleton = false;
tools.git.key = "DE64538967CA0C68";
};
};
generated by cgit v1.2.3 (git 2.43.0) at 2026-04-19 17:16:39 +0000