diff --git a/nixos/base.nix b/nixos/base.nix index 37075c21..facaad35 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -36,7 +36,7 @@ makeEnable config "myModules.base" true { }; # Audio - hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; # Bluetooth hardware.bluetooth.enable = true; diff --git a/nixos/desktop.nix b/nixos/desktop.nix index d490d2b8..13975f35 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -71,7 +71,7 @@ makeEnable config "myModules.desktop" true { notify-osd-customizable okular pinentry - psensor + mission-center quassel remmina rofi diff --git a/nixos/flake.lock b/nixos/flake.lock index 388ea7e6..2c4de28c 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -781,11 +781,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1727381010, + "narHash": "sha256-2PqUwnZXjYiPUm5A4d8Z31mvLS4lvUeV/9gUhSMmNR4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "853e7bd24f875bac2e3a0cf72f993e917d0f8cf5", "type": "github" }, "original": { @@ -959,11 +959,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1724874960, - "narHash": "sha256-cmmNq/tFU4MZYU5RAuUVt1NGt5e6RMaMsvJtU5ybEJI=", + "lastModified": 1727380702, + "narHash": "sha256-1YUAqvZc9YOUERyPiaOGYEg2fIf20+yIWGhzB0Ke6j8=", "owner": "NixOS", "repo": "nix", - "rev": "b89eca9aecc69d4dfc0f0afd9353c126eb7b5858", + "rev": "0ed67e5b7ee9ad8fae162e1b10b25d22ada2b1f3", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724664098, - "narHash": "sha256-4SgV4jCoN5RffR1Mtn3HI1cjgHmARh+rZrpVlBclj9U=", + "lastModified": 1727091786, + "narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "345dfa06658a37873ca18aa205f409e4aaf1caa6", + "rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278", "type": "github" }, "original": { @@ -1077,21 +1077,6 @@ "type": "github" } }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1725042541, - "narHash": "sha256-2ItfpRi49hr3LrHnWLBqEFrnKbREHnWjgyrJzaPnjkI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "963ea288f4a82f4945813037d4e8d1bfd149c3e5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1723688146, @@ -1126,11 +1111,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "type": "github" }, "original": { @@ -1142,16 +1127,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1725043766, - "narHash": "sha256-iNXaq3XJkLDc9Fhs1dWi9Fj/pmMbVZ2PV33ME3JhcUI=", - "owner": "colonelpanic8", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "f53b146e86208b06645bfabf5527d47f0b0c6c5e", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { - "owner": "colonelpanic8", - "ref": "with-cursor", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1300,11 +1285,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1723672467, - "narHash": "sha256-6GbCvAboNKot15sHrYJqONIyu9T5OUokEubghgPHLUw=", + "lastModified": 1726075726, + "narHash": "sha256-eQPDAzUJg8fwqiCyWsKxtHV+G1LGJKs9X3ZtOzytuDE=", "ref": "refs/heads/master", - "rev": "e067ec9b790bbe76d8bff667c072e2e19cd68fa7", - "revCount": 76, + "rev": "70d8ffd3f3b79b97477ae0655524273bb098b6c5", + "revCount": 86, "type": "git", "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git" }, @@ -1327,7 +1312,6 @@ "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_5", - "nixpkgs-regression": "nixpkgs-regression_2", "notifications-tray-icon": "notifications-tray-icon", "railbird-secrets": "railbird-secrets", "status-notifier-item": "status-notifier-item", @@ -1570,6 +1554,7 @@ }, "original": { "owner": "taffybar", + "ref": "old-master", "repo": "taffybar", "type": "github" } @@ -1593,11 +1578,11 @@ }, "unstable": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -1640,11 +1625,11 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1722277235, - "narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=", + "lastModified": 1726451364, + "narHash": "sha256-6WKgYq0+IzPSXxVl1MfODIVwEbd3Sw0zc5sMSOyzA8I=", "owner": "xmonad", "repo": "xmonad", - "rev": "a58ccac7ba46414915de6c7f2b4da08b37784016", + "rev": "a4140b93497333ec7f3127ee4dabcb8ae8a721b6", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 6810edef..36df46db 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -6,7 +6,7 @@ nixos-hardware = { url = "github:colonelpanic8/nixos-hardware/add-g834jzr"; }; nixpkgs = { - url = "github:colonelpanic8/nixpkgs/with-cursor"; + url = "github:NixOS/nixpkgs/nixos-unstable"; }; home-manager = { @@ -34,7 +34,7 @@ }; taffybar = { - url = "github:taffybar/taffybar"; + url = "github:taffybar/taffybar/old-master"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; @@ -104,8 +104,6 @@ vscode-server.url = "github:nix-community/nixos-vscode-server"; - nixpkgs-regression = { url = "github:NixOS/nixpkgs"; }; - nixified-ai = { url = "github:nixified-ai/flake"; }; nixos-wsl = { url = "github:nix-community/NixOS-WSL"; }; diff --git a/nixos/keys.nix b/nixos/keys.nix index f6f2b7be..37c06793 100644 --- a/nixos/keys.nix +++ b/nixos/keys.nix @@ -56,6 +56,5 @@ rec { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com" ]; interviewKeys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDr3Rim92K0aNWh2wCZjZMj927H6NZMvw+Jg5giVEklv/eeXlJn81xm9kFsqWOmN0IyS4X+2V2G/43t4C+REmzMKjkzTu9u6SJi+pC3jdJRm80sJCz2LBdRjPaY3CEubiUdxWvjisE8wUI1YuxxdegJpcemvhZXBfDU+DOqNEtF9KiPhXFMOoGU18k5AqFatdmE4z0H158cc6rCxdEiM8s+H6AJDA+xZSn9BPSx2I/ySRapoN0qJDloV19795ggnegBOjNuGejnKI0RZ8CyTcf1945Yi8/O/i/IChRlxiArjgAbC2DItkQig8YyQYz6WlKE9bwruMqe+8mgBAfuQXH8yTADwD1156VCRGoYAorAz4CLm73oGKtx4pa6WFsklWAIK1UEAhuLT6FKaJ/mmfKxcqdHxj+29FNo3d2Pam/ecFd0aERi5TExH5GKZr+LI7yKQmgk6laiR0n1wZuDwlNN7+69GH+ScxRngGCkc3RdTToqXzEaN3B6EyiAN/sAUgs= finn@LAPTOP-JI7BSSRJ" ]; } diff --git a/nixos/users.nix b/nixos/users.nix index b3851037..2276aab8 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -92,12 +92,12 @@ in railbird = userDefaults // { inherit extraGroups; name = "railbird"; - openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdDevKeys; + openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdFullstackDevKeys; }; interview = userDefaults // { inherit extraGroups; name = "interview"; - openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdDevKeys; + openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdFullstackDevKeys; }; };