diff --git a/flake.lock b/flake.lock index 810dfe1..530d940 100644 --- a/flake.lock +++ b/flake.lock @@ -67,27 +67,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -470,42 +449,6 @@ "type": "github" } }, - "neovim-nightly": { - "inputs": { - "flake-parts": "flake-parts", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1771113898, - "narHash": "sha256-0t6wai1op7OUc4mAhM4BYIbfQMvYmMhW2jXP2VQ0/KA=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "5e829d6d57633d5d56a0f351564331fca40d507b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1771089488, - "narHash": "sha256-xHSWR7wo4GiZVWAoBlD4f2szoftfoxOCqlOu1UBL9Wc=", - "owner": "neovim", - "repo": "neovim", - "rev": "8ab511bba524bcd5b5913d1b1205b5e4fe3f7210", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1770882871, @@ -557,35 +500,19 @@ "locked": { "lastModified": 1770843696, "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -629,9 +556,8 @@ "claude-code": "claude-code", "home-manager": "home-manager", "hyprland": "hyprland", - "neovim-nightly": "neovim-nightly", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "zen-browser": "zen-browser" } }, @@ -694,7 +620,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1771131295, diff --git a/flake.nix b/flake.nix index 971fab5..8b39994 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; - neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; claude-code.url = "github:ryoppippi/claude-code-overlay"; hyprland.url = "github:hyprwm/Hyprland"; @@ -19,7 +18,6 @@ nixpkgs, home-manager, nixos-hardware, - neovim-nightly, zen-browser, claude-code, hyprland, @@ -27,7 +25,6 @@ }: let overlays = [ - neovim-nightly.overlays.default claude-code.overlays.default ]; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index f2de5b0..e5c6ce8 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -45,13 +45,7 @@ in hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else pkgs.hyprland; - portalPackage = - if !hostConfig.isNixOS then - null - else if hyprland != null then - hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland - else - pkgs.xdg-desktop-portal-hyprland; + portalPackage = null; systemd.enable = hostConfig.isNixOS; extraConfig = '' diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix index ad7649c..8c9f8aa 100644 --- a/hosts/xps15/configuration.nix +++ b/hosts/xps15/configuration.nix @@ -58,6 +58,7 @@ in environment.etc."gitconfig".text = '' [safe] directory = /home/barrett/.config/nix + directory = /home/barrett/.cache/nix/tarball-cache ''; environment.binsh = "${pkgs.dash}/bin/dash"; diff --git a/scripts/ctl b/scripts/ctl index e7a8f2d..04cc289 100755 --- a/scripts/ctl +++ b/scripts/ctl @@ -176,7 +176,16 @@ wifi) count=$(printf '%s\n' "$networks" | wc -l) ssid=$(printf '%s\n' "$networks" | fuzzel --dmenu --prompt="wifi: " --no-icons --lines="$count") [ -z "$ssid" ] && exit 0 - iwctl station "$station" connect "$ssid" + known=$(iwctl known-networks list 2>/dev/null | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g') + if printf '%s' "$known" | grep -qF "$ssid"; then + iwctl station "$station" connect "$ssid" + elif iwctl station "$station" get-networks 2>/dev/null | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' | grep -F "$ssid" | grep -qi "open"; then + iwctl station "$station" connect "$ssid" + else + pass=$(printf '' | fuzzel --dmenu --prompt="passphrase: " --no-icons --password --lines=0) + [ -z "$pass" ] && exit 0 + iwctl station "$station" connect "$ssid" --passphrase "$pass" + fi ;; *) echo "Usage: ctl wifi {pick}" >&2