From 95f1f15a683cb95a7ea98813c0676702f6a7d434 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 15 Mar 2026 17:04:38 +0000 Subject: [PATCH] More stuff --- flake.nix | 10 +++++++-- hardware/default.nix | 1 + mounts.nix => hardware/mounts.nix | 13 +++++++++++ home/default.nix | 6 ++--- home/hooks.nix | 6 +++++ home/impermanence.nix | 4 ++++ home/packages.nix | 37 +++++++++++++++++++++++++++---- home/programs.nix | 4 ++++ system/packages.nix | 1 + 9 files changed, 73 insertions(+), 9 deletions(-) rename mounts.nix => hardware/mounts.nix (72%) diff --git a/flake.nix b/flake.nix index ae02ce4..dfa5315 100644 --- a/flake.nix +++ b/flake.nix @@ -52,8 +52,14 @@ } @ inputs: let lib = nixpkgs.lib; system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; mkHost = hostname: nixpkgs.lib.nixosSystem { modules = [ diff --git a/hardware/default.nix b/hardware/default.nix index 3bf3e59..93fa9df 100644 --- a/hardware/default.nix +++ b/hardware/default.nix @@ -4,6 +4,7 @@ imports = [ ./disko.nix ./filesystem.nix + ./mounts.nix ./${hostname}-hardware-configuration.nix ]; } diff --git a/mounts.nix b/hardware/mounts.nix similarity index 72% rename from mounts.nix rename to hardware/mounts.nix index ba0e1e0..6984139 100644 --- a/mounts.nix +++ b/hardware/mounts.nix @@ -30,5 +30,18 @@ "noauto" ]; }; + + "/home/chris/Games" = { + device = "889e9f90-2d41-4f6b-a0af-21a727465a32"; + 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 65e7d38..7945d81 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,9 +4,9 @@ imports = [ ./packages.nix ./programs.nix - ./hooks.nix - ./impermanence.nix - ./services.nix + ./hooks.nix + ./impermanence.nix + ./services.nix ]; home = { username = "chris"; diff --git a/home/hooks.nix b/home/hooks.nix index 1d884f4..6f31cac 100644 --- a/home/hooks.nix +++ b/home/hooks.nix @@ -72,6 +72,12 @@ if [ ! -f "$DEST_FILE" ]; then cp "${../initial-configs/Enpass.conf}" "$DEST_FILE" fi + + DEST_FILE="$HOME/.config/obsidian/obsidian.json" + + if [ ! -f "$DEST_FILE" ]; then + cp "${../initial-configs/obsidian.json}" "$DEST_FILE" + fi ''; setupDefaultWallpaper = lib.hm.dag.entryAfter ["writeBoundary"] '' if [[ -v DRY_RUN ]]; then diff --git a/home/impermanence.nix b/home/impermanence.nix index e01755d..3ca61e6 100644 --- a/home/impermanence.nix +++ b/home/impermanence.nix @@ -12,13 +12,17 @@ ".cache/zsh" ".mozilla/firefox" ".config/nvim" + ".cache/wal" ".config/yazi/plugins" ".config/nixos" ".config/sinew.in" ".config/chromium" + ".config/obsidian" ".config/superProductivity" + ".config/Antigravity" ".local/share/direnv" ".local/share/nvim" + ".local/share/krita" ".local/share/voxtype" ".local/share/zoxide" ".local/share/Enpass" diff --git a/home/packages.nix b/home/packages.nix index 4c9879c..a1d088d 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,4 +1,14 @@ -{ pkgs, try-cli, ... }: +{ pkgs, pkgs-unstable, try-cli, ... }: + +let +enpass = pkgs.enpass.overrideAttrs (oldAttrs: rec { + version = "6.11.13.1957"; + src = pkgs.fetchurl { + url = "https://apt.enpass.io/pool/main/e/enpass/enpass_${version}_amd64.deb"; + sha256 = "2d8c90643851591aff41057b380a7e87bb839bf5c5aa0ca1456144e9996c902a"; + }; +}); +in { nixpkgs = { @@ -16,8 +26,8 @@ antigravity # Gemini AI coding assistant bluetui # Bluetooth TUI direnv # Directory environment manager - #enpass # Password manager - #enpass-cli # Enpass CLI tool + enpass # Password manager + enpass-cli # Enpass CLI tool expressvpn # VPN ffmpeg # Video tools ffmpegthumbnailer # Video thumbnailer @@ -30,7 +40,6 @@ krita # Digital art software libreoffice-fresh # Office suite lunar-client # Minecraft launcher - mailspring # Mail client mpv # Video player nautilus # Document viewer nextcloud-client # Nextcloud sync client @@ -40,11 +49,31 @@ super-productivity # Task app sxiv # Minimal image viewer tenacity # Audio software + thunderbird # Mail client try-cli.packages.${pkgs.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 ]; + 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 6dae6fe..b323c15 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -23,6 +23,10 @@ elephant = { enable = true; }; + waybar = { + enable = true; + systemd.enable = true; + }; voxtype = { enable = true; package = voxtype.packages.${pkgs.system}.vulkan; diff --git a/system/packages.nix b/system/packages.nix index 3310267..85d241b 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -43,6 +43,7 @@ rustc # Rust compiler rustfmt # Rust formatter satty # Screenshot editor TODO: Figure out and configure + sshpass # SSH with password in CLI, used by install scripts swaybg # Wayland wallpaper utility tldr # Simplified man pages tmux # Terminal multiplexer