diff options
| -rw-r--r-- | flake.lock | 79 | ||||
| -rw-r--r-- | hosts/workstation/default.nix | 147 |
2 files changed, 129 insertions, 97 deletions
@@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -168,6 +168,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -176,11 +204,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -191,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729449015, - "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89172919243df199fe237ba0f776c3e3e3d72367", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -207,11 +235,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -236,11 +264,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729699620, - "narHash": "sha256-f6S8JX5w9bPLMbaqR5dM5koybZntdSFfKyfq/LQU7rs=", + "lastModified": 1730049454, + "narHash": "sha256-oQI1yCICg0LpZfPLhhP9aMsGtkK2hm/isAwV2meC9xI=", "owner": "nix-community", "repo": "nixvim", - "rev": "029eafd70d6e28919a9ec01a94a46b51c4ccff40", + "rev": "38abcfe89adb4e56b046c4fc429139bde9405f5b", "type": "github" }, "original": { @@ -252,17 +280,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", + "lastModified": 1730044642, + "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "owner": "NuschtOS", "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", + "rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "type": "github" }, "original": { @@ -304,11 +333,11 @@ ] }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "type": "github" }, "original": { @@ -324,11 +353,11 @@ ] }, "locked": { - "lastModified": 1726916137, - "narHash": "sha256-isknI2AkrBdV6Bkbm/ytbBYbm0motJvB9wPqT1sSO1k=", + "lastModified": 1729720331, + "narHash": "sha256-FZCFnjwT8m/1yOUCErIRNWH9Yze0Q5jYDb/mCmnEJ9E=", "ref": "refs/heads/master", - "rev": "21afec7d459855808444ef8157a2249b2fb2782c", - "revCount": 33, + "rev": "70af99261098e1dc951e192d44cee880cfe872ab", + "revCount": 37, "type": "git", "url": "https://git.nathanreiner.xyz/webtray" }, diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index acae824..34d17b9 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -1,88 +1,91 @@ { pkgs, nixpkgs, ... }: { - imports = [ - ./hardware.nix - ../../modules/hyprland/monitor.nix - ../../modules/usbauth/default.nix - ]; + imports = [ + ./hardware.nix + ../../modules/hyprland/monitor.nix + ../../modules/usbauth/default.nix + ]; - nixpkgs.config.rocmSupport = true; + nixpkgs.config.rocmSupport = true; - networking.hostName = "workstation"; + networking.hostName = "workstation"; - boot.loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - device = "nodev"; - efiSupport = true; - gfxmodeEfi = "1920x1080"; - }; - }; + boot.loader = { + efi.canTouchEfiVariables = true; + grub = { + enable = true; + device = "nodev"; + efiSupport = true; + gfxmodeEfi = "1920x1080"; + }; + }; - hyprland.monitors = { - default = { - resolution = "preferred"; - position = "auto"; - scale = 1; - }; + hyprland.monitors = { + default = { + resolution = "preferred"; + position = "auto"; + scale = 1; + }; - DP-2 = { - resolution = "preferred"; - position = "auto"; - scale = 1; - bar.enable = true; - }; + DP-2 = { + resolution = "preferred"; + position = "auto"; + scale = 1; + bar.enable = true; + }; - DP-3 = { - resolution = "preferred"; - position = "auto"; - scale = 1; - transform = { - rotation = 90; - }; - }; + DP-3 = { + resolution = "preferred"; + position = "auto"; + scale = 1; + transform = { + rotation = 90; + }; + }; - HDMA-A-1 = { - resolution = "preferred"; - position = "auto"; - scale = 1; - }; - }; + HDMA-A-1 = { + resolution = "preferred"; + position = "auto"; + scale = 1; + }; + }; - webtray.instances = { - element = { - url = "https://chat.nathanreiner.xyz"; - autoStart = true; - openInWindow = false; - }; - syncthing-tray = { - url = "http://localhost:8384"; - autoStart = true; - openInWindow = false; - }; - }; + webtray.instances = { + element = { + url = "https://chat.nathanreiner.xyz"; + autoStart = true; + openInWindow = false; + }; + syncthing-tray = { + url = "http://localhost:8384"; + autoStart = true; + openInWindow = false; + }; + }; - usbauth = { - enable = true; - device = "root"; - uuid = "543f281c-4feb-4a5a-b51b-99114fa4b8a1"; - keyname = "n8"; - }; + usbauth = { + enable = true; + device = "root"; + uuid = "543f281c-4feb-4a5a-b51b-99114fa4b8a1"; + keyname = "n8"; + }; - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ - amdvlk - rocmPackages.clr.icd - ]; - }; + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + extraPackages = with pkgs; [ + amdvlk + rocmPackages.clr.icd + vulkan-loader + vulkan-validation-layers + vulkan-extension-layer + ]; + }; - systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; + systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; - environment.systemPackages = with pkgs; [ clinfo ]; + environment.systemPackages = with pkgs; [ clinfo ]; - system.stateVersion = "24.05"; + system.stateVersion = "24.05"; } |