From 357b9a4f04c391cd8ab29b2de994fc471021da4e Mon Sep 17 00:00:00 2001 From: kenji Date: Tue, 1 Jul 2025 09:31:36 -0500 Subject: [PATCH] test --- config.nix | 7 +-- packages/quickshell/default.nix | 76 --------------------------------- system/dev/tools.nix | 2 + system/services.nix | 2 +- 4 files changed, 7 insertions(+), 80 deletions(-) diff --git a/config.nix b/config.nix index f94396a..0fa214b 100644 --- a/config.nix +++ b/config.nix @@ -32,9 +32,10 @@ }; ssh = { extraConfig = '' - Host macair - User biscuit - HostName 192.168.68.81 + Host gitea.sakamoto.dev + User kenji + ProxyCommand cloudflared access ssh --hostname %h + HostName gitea.sakamoto.dev ''; }; }; diff --git a/packages/quickshell/default.nix b/packages/quickshell/default.nix index f5ac7ee..2c63c08 100644 --- a/packages/quickshell/default.nix +++ b/packages/quickshell/default.nix @@ -1,78 +1,2 @@ -{ pkgs, inputs, ... }: # Make sure 'inputs' is passed to this module if it's separate from flake.nix -# If this is configuration.nix, 'inputs' might need to be destructured from 'config' or similar -# e.g. { config, pkgs, inputs, ... }: - -let - # Define caelestia-cli as a derivation - caelestia-cli-pkg = pkgs.callPackage ({ stdenv, fetchFromGitHub, gitMinimal }: - stdenv.mkDerivation { - pname = "caelestia-cli"; - version = "git"; # Or the commit date/hash - - # Use the 'caelestia-cli-src' input defined in your flake.nix - src = fetchFromGitHub { - owner = "caelestia-dots"; - repo = "cli"; - rev = inputs.caelestia-cli-src.rev; # Use the revision from the flake input - # You'll get the correct sha256 after the first `nixos-rebuild switch` or `home-manager switch` - # Just put a placeholder like "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" - # and Nix will tell you the correct one. - sha256 = "sha256-wQzSssFp/W6g7Y1qC/4P558V+6H1R+5Z4A3k8N1Y0M4="; # REPLACE THIS WITH THE ACTUAL SHA256 - }; - - # If caelestia-cli needs to be built (e.g., it's a Rust/Go/Python project), - # you'll need to specify build inputs and phases. - # From a quick look, it appears to be a Python script, so it might need python interpreter and dependencies. - # Example for a Python script: - buildInputs = with pkgs; [ python3 ]; - installPhase = '' - mkdir -p $out/bin - # Assuming the main executable is 'caelestia.py' or similar in the root - # If it's a single script, you might need to copy it and make it executable. - cp $src/caelestia.py $out/bin/caelestia-cli # Adjust filename as needed - chmod +x $out/bin/caelestia-cli - ''; - # If it has Python dependencies, you might need buildPythonPackage - # or to add them to buildInputs and ensure they are in the python path. - # For a simpler script, just copying might be enough. - # You may need to inspect the 'cli' repo more closely for its build instructions. - # If it's pure shell script, 'stdenv.mkDerivation' is fine with just 'installPhase'. - # If it's a Python project with setup.py, consider using pkgs.python3Packages.buildPythonPackage - # or pkgs.buildPythonApplication. - } - ) { }; # The {} passes no extra args to callPackage here, as we get all its dependencies via 'with pkgs;' - -in { - home.packages = with pkgs; - [ - # Standard Nixpkgs packages - ddcutil - brightnessctl - app2unit # Verify if this is in nixpkgs or needs a custom definition - cava - networkmanager # If you intend to use NetworkManager commands in the shell - lm-sensors - fish - aubio - libpipewire - grim - swappy - libqalculate - - # Custom packages defined via flakes - caelestia-cli-pkg # This is your custom-built package - inputs.quickshell.packages.${pkgs.system}.default # From quickshell flake input - ]; - - # Additional configurations as discussed before: - fonts.fontconfig.enable = true; - fonts.packages = with pkgs; [ - material-symbols - jetbrains-mono-nerd - ]; - - # Uncomment and configure if needed: - # services.sensors.enable = true; - # networking.networkmanager.enable = true; # If this is a Home Manager config, this should likely be in configuration.nix } diff --git a/system/dev/tools.nix b/system/dev/tools.nix index 6ed6cfd..73da81e 100644 --- a/system/dev/tools.nix +++ b/system/dev/tools.nix @@ -6,5 +6,7 @@ jq btop rar + + cloudflared ]; } diff --git a/system/services.nix b/system/services.nix index 7e3f0f6..98321dd 100644 --- a/system/services.nix +++ b/system/services.nix @@ -4,6 +4,6 @@ libinput.enable = true; blueman.enable = true; printing.enable = true; - sensors.enable = true; + # sensors.enable = true; }; }