diff --git a/flake.lock b/flake.lock index 8adce14..08140bc 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741545559, - "narHash": "sha256-K28WBQoi1XSFfuakma+TJveihNbhpYMZUGYwvjAmic8=", + "lastModified": 1742656338, + "narHash": "sha256-Vkg5dyXKwoAfEVlKPxbCbdTCF9sXmTySZBSL28Kcdmo=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "86f26bd7401b8c1e1bde2b9479e88d3b532488d8", + "rev": "b677dbe0d675c68a19dedbc771aff22de76b11ea", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743524395, + "narHash": "sha256-BXVan1TBC2iDJODFvCoz2XrbAOyZ9KWjwyIkOYwO4Mc=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "f6dbc8952df9e40afafbe38449751bfad12d64f2", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1743387206, + "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "type": "github" }, "original": { @@ -536,11 +536,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1742468927, - "narHash": "sha256-3CBAs8OF0etCIaa4p+VyuXfLrL1cvD5E3Dmigqg2YOo=", + "lastModified": 1743517238, + "narHash": "sha256-yJaShaC/XQL4bevEB4KmvUav2fns8Ugh+UmB06AYOXE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7ea4fbf0ba034d947339b3a94a10da022eca1988", + "rev": "1f0fd79b910b798e650d6f0c546273bc83422526", "type": "github" }, "original": { @@ -769,11 +769,11 @@ ] }, "locked": { - "lastModified": 1742174123, - "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", + "lastModified": 1743306489, + "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", + "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", "type": "github" }, "original": { @@ -788,11 +788,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1742522036, - "narHash": "sha256-OmIHuzgZt38vn9SkysbS5D+KaAbKadtaKfODh0iWALk=", + "lastModified": 1743473153, + "narHash": "sha256-RVOgS/5+Nd/Oq3aXhIk8Y3aAILCYwm8nmrvLogy1hI0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4cff80a994fd6edb6c62ee5439cd587b50871cf3", + "rev": "57ed10b9d4395687b38277f422fbb0700f65e632", "type": "github" }, "original": { @@ -839,11 +839,11 @@ ] }, "locked": { - "lastModified": 1742217219, - "narHash": "sha256-pLRjj0jTL1TloB0ptEwVF51IJJX8a17dSxg+gqiWb30=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "83900d5154d840dfae1e0367c5290f59b9dccf03", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -897,11 +897,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -913,11 +913,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -945,11 +945,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742388435, - "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { @@ -975,22 +975,6 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts_4", @@ -1000,11 +984,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1742539398, - "narHash": "sha256-Gf2LI0cV/QMRzXwzG6BvbfSR63mzNpz/taBsC/3mx9I=", + "lastModified": 1743533554, + "narHash": "sha256-lE8FQ4mb1dMmv7aOrcRfiqbYoWNB9i0Bo6iV+5mSGj0=", "owner": "nix-community", "repo": "NUR", - "rev": "0ae0b7ae9cb0c3717e9bb1884cd6566edbffbccb", + "rev": "e971f1c0b58cc3f3a6856ebb685bbff4f10b2e1d", "type": "github" }, "original": { @@ -1022,15 +1006,14 @@ "nixpkgs": [ "nixpkgs" ], - "nmd": "nmd", "systems": "systems_5" }, "locked": { - "lastModified": 1742471089, - "narHash": "sha256-wiGkhJcDdg2/wy4QxaudNsU98y7CzzZpB6pnjUrNNDQ=", + "lastModified": 1743515391, + "narHash": "sha256-C1ZsjHF7znud0fGI8OVM5GeuX5CF5vxONNMq64RUrvY=", "owner": "notashelf", "repo": "nvf", - "rev": "3a28d05684f7f4e314eb4e56a5af624b648ab278", + "rev": "c58ba62a8d22adf61635e025aabb0edbf0adb0b8", "type": "github" }, "original": { @@ -1072,11 +1055,11 @@ ] }, "locked": { - "lastModified": 1742058297, - "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1267,11 +1250,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { diff --git a/hosts/desktop/monitors.nix b/hosts/desktop/monitors.nix index b64640d..937cbac 100644 --- a/hosts/desktop/monitors.nix +++ b/hosts/desktop/monitors.nix @@ -13,13 +13,13 @@ _: { position = "0x1080"; } { - name = "DP-3"; + name = "DP-1"; resolution = "2560x1440"; refreshRate = 144; position = "5120x1080"; } { - name = "DP-1"; + name = "DP-3"; resolution = "1920x1080"; refreshRate = 60; position = "2880x0"; diff --git a/hosts/desktop/nvidia.nix b/hosts/desktop/nvidia.nix index 35c98d3..3f5f82b 100644 --- a/hosts/desktop/nvidia.nix +++ b/hosts/desktop/nvidia.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: { +_: { hardware = { graphics = { enable = true; @@ -10,16 +6,10 @@ nvidia = { open = true; modesetting.enable = true; - powerManagement.enable = true; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.latest; }; }; services.xserver.videoDrivers = ["nvidia"]; - # To fix https://forums.developer.nvidia.com/t/ubuntu-24-04-unable-to-change-power-state-from-d3cold-to-d0-device-inaccessible/304459 - boot.kernelPackages = pkgs.linuxPackages_6_12; - fireproof.home-manager.wayland.windowManager.hyprland.settings = { env = [ "LIBVA_DRIVER_NAME,nvidia" diff --git a/hosts/desktop/ssh.nix b/hosts/desktop/ssh.nix new file mode 100644 index 0000000..82203ad --- /dev/null +++ b/hosts/desktop/ssh.nix @@ -0,0 +1,7 @@ +{lib, ...}: { + fireproof.home-manager.programs.ssh.matchBlocks = { + "bastion.ao" = { + proxyJump = lib.mkForce null; + }; + }; +} diff --git a/hosts/work/ssh.nix b/hosts/work/ssh.nix index d5c6561..b8cf2bb 100644 --- a/hosts/work/ssh.nix +++ b/hosts/work/ssh.nix @@ -1,16 +1,13 @@ {lib, ...}: { fireproof.home-manager.programs.ssh.matchBlocks = { "dev.ao" = { - hostname = "192.168.2.28"; proxyJump = lib.mkForce null; }; "flex.ao" = { - hostname = "192.168.2.5"; proxyJump = lib.mkForce null; }; "bastion.ao" = { hostname = "192.168.2.6"; - proxyJump = lib.mkForce null; }; "clickhouse.ao" = { hostname = "51.158.205.48"; diff --git a/modules/apps/chromium.nix b/modules/apps/chromium.nix index 602847d..8a3ab11 100644 --- a/modules/apps/chromium.nix +++ b/modules/apps/chromium.nix @@ -1,7 +1,7 @@ {pkgsUnstable, ...}: { fireproof.home-manager.programs.chromium = { enable = true; - package = pkgsUnstable.ungoogled-chromium; + package = pkgsUnstable.chromium; extensions = [ "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin "nngceckbapebfimnlniiiahkandclblb" # Bitwarden diff --git a/modules/base/ssh.nix b/modules/base/ssh.nix index 3025591..c7df139 100644 --- a/modules/base/ssh.nix +++ b/modules/base/ssh.nix @@ -56,6 +56,7 @@ in { }; "dev.ao" = { user = "nij"; + hostname = "192.168.2.28"; proxyJump = lib.mkDefault "bastion.ao"; identityFile = "${config.age.secrets.ssh-key-ao.path}"; };