From f1f74562738b383fbfcb383146b4aff0904c5820 Mon Sep 17 00:00:00 2001 From: Jack Mechem Date: Sat, 23 May 2026 15:16:03 -0700 Subject: [PATCH] Left over desktop changes and installed tmuxinator --- flake.lock | 59 ++++++++++++++++++----- flake.nix | 2 + hosts/desktop/configuration.nix | 21 +++++++- modules/home-manager/homepackages.nix | 1 + modules/home-manager/hyprland-desktop.nix | 12 ++--- modules/home-manager/tmux.nix | 2 + 6 files changed, 77 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 51cf32c..d4d65fa 100644 --- a/flake.lock +++ b/flake.lock @@ -49,6 +49,24 @@ "type": "github" } }, + "diskdigger": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1778367682, + "narHash": "sha256-H1hJPlyjIdLLuTpxLJ9qlxSue2L5te7GKCGSPtewjL0=", + "owner": "JackMechem", + "repo": "diskdigger-nix-flake", + "rev": "07c56ee0291e6cc758ced0d738876eaebc1339fe", + "type": "github" + }, + "original": { + "owner": "JackMechem", + "repo": "diskdigger-nix-flake", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -178,7 +196,7 @@ "gtkapps": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1753299093, @@ -197,7 +215,7 @@ "gtkbar": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1775764670, @@ -258,7 +276,7 @@ "inputs": { "crane": "crane", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { @@ -293,11 +311,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -324,6 +342,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1776548001, "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", @@ -339,7 +373,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1775036866, "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", @@ -355,7 +389,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -371,7 +405,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1774386573, "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", @@ -390,11 +424,12 @@ "root": { "inputs": { "claude-code": "claude-code", + "diskdigger": "diskdigger", "gtkapps": "gtkapps", "gtkbar": "gtkbar", "home-manager": "home-manager", "hyprmwh": "hyprmwh", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-app-menu": "rust-app-menu", "server-dash": "server-dash", "server-dash-api": "server-dash-api", @@ -490,7 +525,7 @@ "server-dash": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1777671232, @@ -509,7 +544,7 @@ "server-dash-api": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 16b34af..1a6484e 100755 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,8 @@ gtkapps.url = "github:JackMechem/gtkapps"; gtkbar.url = "github:JackMechem/gtkbar"; hyprmwh.url = "github:JackMechem/hyprmwh"; + + diskdigger.url = "github:JackMechem/diskdigger-nix-flake"; # midirun.url = "path:/home/jack/Projects/midirun"; zen-browser = { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 08cf8f6..c3d3073 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -30,7 +30,10 @@ networking.networkmanager.enable = true; networking.nameservers = [ "192.168.1.164" ]; - networking.firewall.allowedTCPPorts = [ 2200 3000 ]; + networking.firewall.allowedTCPPorts = [ + 2200 + 3000 + ]; nix.settings.experimental-features = [ "nix-command" @@ -54,10 +57,24 @@ # services.gtkapps.enable = true; services.gtkbar.enable = true; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (pkgs.lib.getName pkg) [ + "diskdigger" + ]; + environment.systemPackages = [ - inputs.rust-app-menu.packages.${pkgs.system}.default + inputs.rust-app-menu.packages.${pkgs.system}.default + inputs.diskdigger.packages.${pkgs.system}.diskdigger ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; + # services.midirun = { # enable = true; # }; diff --git a/modules/home-manager/homepackages.nix b/modules/home-manager/homepackages.nix index 969a36b..2778420 100644 --- a/modules/home-manager/homepackages.nix +++ b/modules/home-manager/homepackages.nix @@ -56,6 +56,7 @@ in glib zlib deno + pnpm ### System Monitoring Tools mission-center diff --git a/modules/home-manager/hyprland-desktop.nix b/modules/home-manager/hyprland-desktop.nix index 44f0a20..ea41797 100644 --- a/modules/home-manager/hyprland-desktop.nix +++ b/modules/home-manager/hyprland-desktop.nix @@ -71,10 +71,10 @@ # --- General --- general = { - gaps_in = 3; - gaps_out = "10,10,10,10"; - border_size = 2; - "col.active_border" = "rgba(e4687690)"; + gaps_in = 2; + gaps_out = 3; + border_size = 1; + "col.active_border" = "rgba(ffffff30)"; "col.inactive_border" = "rgba(2c2b3180)"; layout = "dwindle"; allow_tearing = false; @@ -104,8 +104,8 @@ }; shadow = { enabled = true; - range = 20; - render_power = 5; + range = 10; + render_power = 3; color = "rgba(00000040)"; }; }; diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix index e31764e..41bfb6d 100644 --- a/modules/home-manager/tmux.nix +++ b/modules/home-manager/tmux.nix @@ -1,5 +1,7 @@ { pkgs, ... }: { + home.packages = [ pkgs.tmuxinator ]; + programs.tmux = { enable = true; baseIndex = 1;