summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archetypes/collections/utilities.nix1
-rw-r--r--flake.lock46
-rw-r--r--flake.nix4
-rw-r--r--nixos/powerkeys.nix8
-rw-r--r--pkgs/default.nix1
-rw-r--r--users/timmy/default.nix6
6 files changed, 33 insertions, 33 deletions
diff --git a/archetypes/collections/utilities.nix b/archetypes/collections/utilities.nix
index 23535b0..0ac46bd 100644
--- a/archetypes/collections/utilities.nix
+++ b/archetypes/collections/utilities.nix
@@ -1,6 +1,5 @@
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [
- crazydiskinfo
dash # TODO should be default /bin/sh
entr
fastfetch
diff --git a/flake.lock b/flake.lock
index 5596cce..bbd7dea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
"pre-commit": "pre-commit"
},
"locked": {
- "lastModified": 1751321356,
- "narHash": "sha256-7vrKgcIg7jOHVEJrpfjNjcqZnsAoXnJvKK8NuV1x2kU=",
+ "lastModified": 1758550687,
+ "narHash": "sha256-QbHgl7nwSBILJeMRmmvVyz4jkjB8SzDc1gO+CVs9RzM=",
"owner": "dwarfmaster",
"repo": "arkenfox-nixos",
- "rev": "3f04af64f37dad55446417fc2f8c6cf754fde879",
+ "rev": "5f0b72edac3f8fdcafb6fd5e9ca1f55a1d890f03",
"type": "github"
},
"original": {
@@ -41,11 +41,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "lastModified": 1747046372,
+ "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@@ -83,27 +83,27 @@
]
},
"locked": {
- "lastModified": 1756679287,
- "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
+ "lastModified": 1764866045,
+ "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
+ "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-25.05",
+ "ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1730768919,
- "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
+ "lastModified": 1758029226,
+ "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
+ "rev": "08b8f92ac6354983f5382124fef6006cade4a1c1",
"type": "github"
},
"original": {
@@ -115,16 +115,16 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1756617294,
- "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=",
+ "lastModified": 1764831616,
+ "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8",
+ "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-25.05",
+ "ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -136,11 +136,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1750779888,
- "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+ "lastModified": 1758108966,
+ "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+ "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github"
},
"original": {
@@ -164,11 +164,11 @@
]
},
"locked": {
- "lastModified": 1754988908,
- "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+ "lastModified": 1764483358,
+ "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+ "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index c9e7d41..ba25073 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,14 @@ rec {
description = "TimmyOS System Config";
inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
- url = "github:nix-community/home-manager/release-25.05";
+ url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
arkenfox = {
diff --git a/nixos/powerkeys.nix b/nixos/powerkeys.nix
index fd4aa00..6ec6b4c 100644
--- a/nixos/powerkeys.nix
+++ b/nixos/powerkeys.nix
@@ -1,7 +1,7 @@
{
- services.logind = {
- hibernateKey = "suspend";
- powerKey = "ignore";
- powerKeyLongPress = "poweroff";
+ services.logind.settings.Login = {
+ HandleHibernateKey = "suspend";
+ HandlePowerKey = "ignore";
+ HandlePowerKeyLongPress = "poweroff";
};
}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3a268ec..5ac3a76 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,6 @@
{ pkgs, ... }: {
nixpkgs.overlays = with pkgs; [
(final: prev: {
- crazydiskinfo = (callPackage ./crazydiskinfo {});
lowbat = (callPackage ./lowbat {});
workcentre-7800-series = (callPackage ./xerox-workcentre-7800-series-driver {});
unclutter-desktop-entry = (callPackage ./unclutter-desktop-entry {});
diff --git a/users/timmy/default.nix b/users/timmy/default.nix
index cfe37fa..dfac6ea 100644
--- a/users/timmy/default.nix
+++ b/users/timmy/default.nix
@@ -98,8 +98,10 @@ in {
# Setup git
programs.git = {
enable = true;
- userName = fullname;
- userEmail = email;
+ settings.user = {
+ name = fullname;
+ email = email;
+ };
};
# Setup gtk bookmarks