aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock78
-rw-r--r--hosts/underworld/default.nix4
-rw-r--r--hosts/wonderland/default.nix4
-rw-r--r--share/home/hyprdesktop.nix2
-rw-r--r--share/system/common.nix2
5 files changed, 45 insertions, 45 deletions
diff --git a/flake.lock b/flake.lock
index 010ba6f..1c624ca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
]
},
"locked": {
- "lastModified": 1708910350,
- "narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=",
+ "lastModified": 1709439398,
+ "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
"owner": "nix-community",
"repo": "disko",
- "rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d",
+ "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
"type": "github"
},
"original": {
@@ -48,11 +48,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1709053684,
- "narHash": "sha256-2n0raWWfmi7xhWhMksILmchMHi3naPLujrcchQ9RfdU=",
+ "lastModified": 1709516695,
+ "narHash": "sha256-oymuRjQUhUx71xb4N1P9QFx+OmpnSF3pJKU1tsZBlE8=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "cc3baadef2a6e417cff991253f741b7726836649",
+ "rev": "dcb6c5cc11efa3ab804960537242217cf335b230",
"type": "github"
},
"original": {
@@ -98,11 +98,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1706830856,
- "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+ "lastModified": 1709336216,
+ "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+ "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
@@ -134,11 +134,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1705309234,
- "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+ "lastModified": 1709126324,
+ "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+ "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
@@ -233,11 +233,11 @@
]
},
"locked": {
- "lastModified": 1708988456,
- "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
+ "lastModified": 1709485962,
+ "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
+ "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
"type": "github"
},
"original": {
@@ -256,11 +256,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1709045487,
- "narHash": "sha256-AJ6Xeau/j7O2ApwGUGADJc8S74EgVQpxFaQzp0ainjU=",
+ "lastModified": 1709506828,
+ "narHash": "sha256-4gmgQvJZX5KM5i9bqGEOsHSBVRQhyfSF9BvvfpBFmQE=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "98034fea3c1d5c1836bcc3b523cf1089dd5ac502",
+ "rev": "9d89b7109da9b58904caf7c53a7af4b6daed1696",
"type": "github"
},
"original": {
@@ -321,11 +321,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1708807242,
- "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
+ "lastModified": 1709237383,
+ "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
+ "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
@@ -338,11 +338,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1706550542,
- "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+ "lastModified": 1709237383,
+ "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+ "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
@@ -355,11 +355,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1708831307,
- "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
+ "lastModified": 1709309926,
+ "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
+ "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
"type": "github"
},
"original": {
@@ -387,11 +387,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1708819810,
- "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
+ "lastModified": 1709428628,
+ "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
+ "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github"
},
"original": {
@@ -435,11 +435,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1708984720,
- "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
+ "lastModified": 1709237383,
+ "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
+ "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
@@ -548,11 +548,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
- "lastModified": 1708987867,
- "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
+ "lastModified": 1709434911,
+ "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
+ "rev": "075df9d85ee70cfb53e598058045e1738f05e273",
"type": "github"
},
"original": {
@@ -673,11 +673,11 @@
]
},
"locked": {
- "lastModified": 1708897213,
- "narHash": "sha256-QECZB+Hgz/2F/8lWvHNk05N6NU/rD9bWzuNn6Cv8oUk=",
+ "lastModified": 1709373438,
+ "narHash": "sha256-F/Vieen5x2nf05KJ5AitoE/GSB0FU2jMffSM8bHSuBs=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "e497a9ddecff769c2a7cbab51e1ed7a8501e7a3a",
+ "rev": "093f82e5707bb6f14ee38a742748f9fb4ab1488e",
"type": "github"
},
"original": {
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix
index 90b26bb..df867ec 100644
--- a/hosts/underworld/default.nix
+++ b/hosts/underworld/default.nix
@@ -15,8 +15,8 @@
# Using grub because the disko docs tell me to use it
boot = {
- # TODO: remove in favour of kernel 6.7 when it makes it's way into nixpkgs
- kernelPackages = pkgs.linuxPackages_testing;
+ # TODO: remove when the default kernel version becomes at least 6.7
+ kernelPackages = pkgs.linuxPackages_6_7;
loader.grub = {
enable = true;
efiSupport = true;
diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix
index 0863828..62cf6af 100644
--- a/hosts/wonderland/default.nix
+++ b/hosts/wonderland/default.nix
@@ -16,8 +16,8 @@
# Use the systemd-boot EFI boot loader.
boot = {
- # TODO: remove in favour of kernel 6.7 when it makes it's way into nixpkgs
- kernelPackages = pkgs.linuxPackages_testing;
+ # TODO: remove when the default kernel version becomes at least 6.7
+ kernelPackages = pkgs.linuxPackages_6_7;
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
initrd.kernelModules = [ "amdgpu" ];
diff --git a/share/home/hyprdesktop.nix b/share/home/hyprdesktop.nix
index bdb0d54..166a18b 100644
--- a/share/home/hyprdesktop.nix
+++ b/share/home/hyprdesktop.nix
@@ -18,7 +18,7 @@
./kitty.nix
./offpunk.nix
./firefox
- ./emacs
+ #./emacs
./helix.nix
];
diff --git a/share/system/common.nix b/share/system/common.nix
index 909b801..d8bea21 100644
--- a/share/system/common.nix
+++ b/share/system/common.nix
@@ -16,6 +16,6 @@
};
nixpkgs.overlays = [
inputs.hyprland.overlays.default
- inputs.emacs-overlay.overlays.default
+ #inputs.emacs-overlay.overlays.default
];
}