From 655b2fa1218b0bbbf54e0bd6a9b7165308888fc8 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 27 Sep 2026 18:44:40 +0100 Subject: [PATCH] Update files --- flake.lock | 1 - flake.nix | 10 ---------- hardware/station-mounts.nix | 15 --------------- home/default.nix | 24 ------------------------ home/impermanence.nix | 1 - home/packages.nix | 30 +++--------------------------- home/programs.nix | 8 -------- system/packages.nix | 8 -------- 8 files changed, 3 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index 3f096f8..1e450da 100644 --- a/flake.lock +++ b/flake.lock @@ -442,7 +442,6 @@ "nixpkgs-stable": "nixpkgs-stable", "psysonic": "psysonic", "try-cli": "try-cli", - "voxtype": "voxtype", "walker": "walker" } }, diff --git a/flake.nix b/flake.nix index 699430d..4cc1283 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ }; psysonic = { url = "github:Psychotoxical/psysonic"; - # inputs.nixpkgs.follows = "nixpkgs"; # psysonic needs rustc 1.95+, nixos-25.11 only has 1.91 }; try-cli = { url = "github:tobi/try-cli"; @@ -26,21 +25,12 @@ }; elephant = { url = "github:abenz1267/elephant"; - # inputs.nixpkgs.follows = "nixpkgs"; }; walker = { url = "github:abenz1267/walker"; inputs.elephant.follows = "elephant"; inputs.nixpkgs.follows = "nixpkgs"; }; - voxtype = { - url = "github:peteonrails/voxtype"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # hyprland-preview-share-picker = { - # url = "github:WhySoBad/hyprland-preview-share-picker"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; }; outputs = { diff --git a/hardware/station-mounts.nix b/hardware/station-mounts.nix index 742df3d..5181ea0 100644 --- a/hardware/station-mounts.nix +++ b/hardware/station-mounts.nix @@ -4,19 +4,4 @@ imports = [ ./nas-mounts.nix ]; - - # fileSystems = { - # "/home/chris/Games" = { - # device = "/dev/disk/by-label/Games"; - # fsType = "ext4"; - # options = [ - # "defaults" - # "x-systemd.mount-timeout=5" - # "user" - # "exec" - # "x-systemd.automount" - # "noauto" - # ]; - # }; - # }; } diff --git a/home/default.nix b/home/default.nix index a7c8a3e..3389c06 100644 --- a/home/default.nix +++ b/home/default.nix @@ -76,28 +76,4 @@ "text/xml" = [ "nvim.desktop" ]; }; }; - # systemd.user = { - # enable = true; - # timers = { - # "station-battery-monitor" = { - # wantedBy = [ "timers.target" ]; - # timerConfig = { - # OnBootSec = "1min"; - # OnUnitActiveSec = "30sec"; - # Unit = "station-battery-monitor.service"; - # }; - # }; - # }; - # services = { - # "station-battery-monitor" = { - # after = [ "graphical-session.target" ]; - # serviceConfig = { - # Type = "oneshot"; - # ExecStart = "%h/.local/share/omarchy/bin/omarchy-battery-monitor"; - # Environment = "DISPLAY=:0"; - # LogLevelMax = "warning"; - # }; - # }; - # }; - # }; } diff --git a/home/impermanence.nix b/home/impermanence.nix index 1ac25d1..bdb0d95 100644 --- a/home/impermanence.nix +++ b/home/impermanence.nix @@ -36,7 +36,6 @@ ".local/share/Libation" ".local/share/nvim" ".local/share/station" - ".local/share/voxtype" ".local/share/zoxide" ".local/state/station" ".local/state/wireplumber" diff --git a/home/packages.nix b/home/packages.nix index f4e1df7..4c272b6 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -24,14 +24,11 @@ in }; }; home.packages = with pkgs; [ - antigravity-ide # Gemini AI coding assistant antigravity-cli # Gemini AI coding assistant - atlauncher # Minecraft launcher bitwarden-cli bitwarden-desktop bluetui # Bluetooth TUI enpass # Password manager - enpass-cli # Enpass CLI tool expressvpn # VPN ffmpeg # Video tools ffmpegthumbnailer # Video thumbnailer @@ -41,24 +38,21 @@ in imv # Image viewer inkscape # Vector graphics software krita-appimage # Custom digital art software (from AppImage) - # libation # Audible book manager - libreoffice-fresh # Office suite + libreoffice-stable # Office suite moonlight-qt # Game streaming client mpv # Video player nautilus # Document viewer pkgs-stable.nextcloud-client # Nextcloud sync client - obsidian # Notes software - inputs.psysonic.packages.${pkgs.system}.default # Music player + inputs.psysonic.packages.${pkgs.stdenv.hostPlatform.system}.default # Music player signal-desktop # Messaging spotify # Music super-productivity # Task app sxiv # Minimal image viewer tenacity # Audio software thunderbird # Mail client - inputs.try-cli.packages.${pkgs.system}.default # Try CLI tool + inputs.try-cli.packages.${pkgs.stdenv.hostPlatform.system}.default # Try CLI tool wally-cli # Keyboard flasher wiremix # Audio mixer TUI - xournalpp # Handwriting note-taking software yad # For creating dialogs during install script zenity # For creating dialogs during install script zathura # Minimal PDF viewer @@ -91,22 +85,4 @@ in terminal = false; }; }; - # xdg.desktopEntries.enpass = { - # type = "Application"; - # name = "Enpass"; - # genericName = "Enpass Password Manager"; - # icon = "enpass"; - # terminal = false; - # exec = "env QT_SCREEN_SCALE_FACTORS=2 ${enpass}/bin/Enpass %U"; - # mimeType = [ - # "x-scheme-handler/enpassauth" - # "x-scheme-handler/enpasscard" - # "x-scheme-handler/enpassstart" - # "x-scheme-handler/enpass" - # "x-scheme-handler/cloudkit-7adb8cc64f.in.sinew.walletx" - # "x-scheme-handler/enpassshare" - # "application/enpasscard" - # ]; - # categories = [ "Utility" ]; - # }; } diff --git a/home/programs.nix b/home/programs.nix index 364ecd0..aab190c 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -3,7 +3,6 @@ { imports = [ inputs.walker.homeManagerModules.default - inputs.voxtype.homeManagerModules.default ]; programs = let lock-false = { @@ -31,12 +30,6 @@ enable = true; systemd.enable = true; }; - voxtype = { - enable = true; - package = inputs.voxtype.packages.${pkgs.system}.vulkan; - service.enable = true; - settings = {}; - }; chromium = { enable = true; extensions = [ @@ -119,6 +112,5 @@ }; }; }; - xdg.configFile."voxtype/config.toml".enable = false; home.file.".icons/default".source = "${pkgs.vimix-cursors}/share/icons/Vimix-white-cursors"; } diff --git a/system/packages.nix b/system/packages.nix index 03f1309..4a87750 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -3,12 +3,9 @@ { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - # hyprland-preview-share-picker.packages.${system}.default # Hyprland share picker TODO: Figure out and configure bat # Better cat brightnessctl # Backlight control btop # Resource monitor - cargo # Rust build tool - clippy # Rust linter eza # Better ls fcitx5 # Input method framework TODO: Figure out and configure fzf # Fuzzy file finder @@ -22,7 +19,6 @@ hyprcursor # Hyprland cursor theme support hypridle # Idle daemon for Hyprland hyprlock # Screen locker for Hyprland - hyprpaper # Wallpaper utility for Hyprland TODO: Check if necessary with swaybg hyprpicker # Hyprland colour picker imagemagick # Image manipulation tool impala # Wifi TUI @@ -34,7 +30,6 @@ makima # Key remapper for Linux TODO: Figure out and configure mako # Notification daemon neovim # Editor - nix-gaming.mo2installer pnpm # JavaScript package manager (used by Neovim plugins) tree-sitter # Incremental parsing tool for editors nodejs_24 # JavaScript runtime @@ -46,8 +41,6 @@ qt6.qtwayland # qtwayland support ripgrep # Better grep rsync # Remote file sync - rustc # Rust compiler - rustfmt # Rust formatter satty # Screenshot editor TODO: Figure out and configure seahorse # GNOME Keyring manager sshpass # SSH with password in CLI, used by install scripts @@ -66,7 +59,6 @@ wl-clipboard # Wayland clipboard manager wlogout # Wayland logout menu xdg-terminal-exec # XDG terminal execution utility - # yarn-berry # JavaScript package manager yarn # JavaScript package manager zip # Archiver tool zoxide # Better cd