From 71d3e4623cfa13e3c0b9041b9c0bca2d86fe45a3 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 8 Mar 2026 21:00:47 +0000 Subject: [PATCH] Update files --- flake.lock | 102 ++++++++++++++--------------- flake.nix | 117 ++++++++++++++++------------------ initial-configs/Enpass.conf | 34 ++++++++++ initial-configs/nextcloud.cfg | 54 ++++++++++++++++ 4 files changed, 191 insertions(+), 116 deletions(-) create mode 100644 initial-configs/Enpass.conf create mode 100644 initial-configs/nextcloud.cfg diff --git a/flake.lock b/flake.lock index bba2205..4ae7379 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,15 @@ }, "elephant": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "systems": "systems" }, "locked": { - "lastModified": 1770910218, - "narHash": "sha256-IyHoHbhLFuIgFG+n7dqHwJaXuNnRaEsxCfAsfudV1KY=", + "lastModified": 1772866605, + "narHash": "sha256-r2ucLztXQFRu70VrGtNcL3PONyazxDPwq/hSn7opD+I=", "owner": "abenz1267", "repo": "elephant", - "rev": "c354a596ec7a7e34e9c26478dc7ef9680bc23e6d", + "rev": "1a52df65c679d17f9889abeb5593aa7ffc40f681", "type": "github" }, "original": { @@ -48,11 +46,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1772078860, - "narHash": "sha256-Pojf7QHic9RmZFIoWYx5LoHy1UytoOHuGnLH3U5Nipo=", + "lastModified": 1772957263, + "narHash": "sha256-Rg/pXdpJFK5pGwUEu0wop942QgbrEch+dWB05h3l7uc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ae41eb07a37d1d5cd7b5714df0fbcb315c492e4d", + "rev": "be0d1413792f3811be7e0c4e9b17e94cbbe73fb9", "type": "gitlab" }, "original": { @@ -105,11 +103,11 @@ ] }, "locked": { - "lastModified": 1772020340, - "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", + "lastModified": 1772633058, + "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", + "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", "type": "github" }, "original": { @@ -127,11 +125,11 @@ ] }, "locked": { - "lastModified": 1772060133, - "narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=", + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", "type": "github" }, "original": { @@ -140,31 +138,10 @@ "type": "github" } }, - "hyprland-preview-share-picker": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772618757, - "narHash": "sha256-c/nM1NAmSl5qWEblK4E1vtjxuVDukHPER81eC/tp4UM=", - "owner": "WhySoBad", - "repo": "hyprland-preview-share-picker", - "rev": "344394a8669fb82ff2744d2780327dd402ffb76a", - "submodules": true, - "type": "github" - }, - "original": { - "owner": "WhySoBad", - "repo": "hyprland-preview-share-picker", - "type": "github" - } - }, "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1769548169, @@ -182,11 +159,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772082373, - "narHash": "sha256-wySf8a6hvuqgFdwvvzPPTARBCMLDz7WFAufGkllD1M4=", + "lastModified": 1768661221, + "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915", + "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", "type": "github" }, "original": { @@ -213,11 +190,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -229,11 +206,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -243,13 +236,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1772047000, - "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -265,9 +258,8 @@ "elephant": "elephant", "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "hyprland-preview-share-picker": "hyprland-preview-share-picker", "impermanence": "impermanence", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "try-cli": "try-cli", "voxtype": "voxtype", @@ -372,11 +364,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771062828, - "narHash": "sha256-y1jBFFO0u+V21y3YldHZozrDwVJVrdC+o3c4M8/rasU=", + "lastModified": 1772866748, + "narHash": "sha256-Z18wVHImX/w9zoruMlSQuh4JcrJh28jxDwR96oevCzM=", "owner": "abenz1267", "repo": "walker", - "rev": "19b1104585305e0806b842af341630f72038a4b9", + "rev": "ddaf9a02a81155c0de8b7b8db9341825afba319e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a686e5a..a144316 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ }; elephant = { url = "github:abenz1267/elephant"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; walker = { url = "github:abenz1267/walker"; @@ -31,10 +31,10 @@ url = "github:peteonrails/voxtype"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland-preview-share-picker = { - url = "github:WhySoBad/hyprland-preview-share-picker"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # hyprland-preview-share-picker = { + # url = "github:WhySoBad/hyprland-preview-share-picker"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = { @@ -46,7 +46,7 @@ home-manager, try-cli, voxtype, - hyprland-preview-share-picker, + # hyprland-preview-share-picker, ... } @ inputs: let lib = nixpkgs.lib; @@ -194,8 +194,10 @@ ]; }; systemPackages = with pkgs; [ - hyprland-preview-share-picker.packages.${system}.default + # hyprland-preview-share-picker.packages.${system}.default + swaybg makima + fcitx5 pywal16 uwsm v4l-utils @@ -329,6 +331,7 @@ system.stateVersion = "25.11"; home-manager = { users.chris = { pkgs, lib, ... }: { + xdg.configFile."voxtype/config.toml".enable = false; home = { file.".mozilla/firefox/default/search.json.mozlz4".force = lib.mkForce true; username = "chris"; @@ -348,6 +351,7 @@ ".config/yazi/plugins" ".config/nixos" ".config/sinew.in" + ".config/chromium" ".local/share/direnv" ".local/share/nvim" ".local/share/voxtype" @@ -416,14 +420,26 @@ fi done ''; + setupInitialConfigs = lib.hm.dag.entryAfter ["writeBoundary"] '' + if [[ -v DRY_RUN ]]; then + echo "Dry run: Would copy initial config files" + exit + fi + + DEST_FILE="$HOME/.config/Nextcloud/nextcloud.cfg" + + if [ ! -f "$DEST_FILE" ]; then + cp "${./initial-configs/nextcloud.cfg}" "$DEST_FILE" + fi + + DEST_FILE="$HOME/.config/sinew.in/Enpass.conf" + + if [ ! -f "$DEST_FILE" ]; then + cp "${./initial-configs/Enpass.conf.cfg}" "$DEST_FILE" + fi + ''; }; packages = with pkgs; [ - # jetbrains.rider - # android-studio - # beekeeper-studio - # brave - # go - # lua lunar-client chromium direnv @@ -433,31 +449,10 @@ spotify nodePackages.pnpm try-cli.packages.${system}.default - # (python3.withPackages (python-pkgs: [ python-pkgs.pip python-pkgs.requests ])) - # zig obsidian mailspring - # thunderbird - # libreoffice-qt - # hunspell - # blueberry - # pkgs-unstable.hyprshot - # catppuccin-cursors.macchiatoBlue - # catppuccin-gtk - # papirus-folders - # pkgs-unstable.php84Packages.composer - # pkgs-unstable.php84Packages.xdebug - # pkgs-unstable.php84Extensions.sqlite3 - # pkgs-unstable.php84Extensions.redis - # pkgs-unstable.php84Extensions.sodium - # pkgs-unstable.php84Extensions.pgsql - # pkgs-unstable.php84Extensions.iconv - # pkgs-unstable.php84Extensions.gd - # pkgs-unstable.php84Extensions.zip - # php antigravity gimp - # kdePackages.dolphin nautilus enpass enpass-cli @@ -479,11 +474,9 @@ uwsm wally-cli kdePackages.wacomtablet - # kdePackages.print-manager mpv vlc imv - # telegram-desktop ]; }; xdg.mimeApps = { @@ -555,30 +548,30 @@ services = { swayosd.enable = true; }; - 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"; - }; - }; - }; - }; + # 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"; + # }; + # }; + # }; + # }; programs = let lock-false = { Value = false; @@ -600,8 +593,8 @@ voxtype = { enable = true; package = voxtype.packages.${system}.vulkan; - model.name = "base.en"; service.enable = true; + settings = {}; }; firefox = { enable = true; @@ -719,6 +712,8 @@ nerd-fonts.fira-code ]; }; + hardware.bluetooth.enable = true; + hardware.pulseaudio.enable = true; } ]; }; diff --git a/initial-configs/Enpass.conf b/initial-configs/Enpass.conf new file mode 100644 index 0000000..eee5e88 --- /dev/null +++ b/initial-configs/Enpass.conf @@ -0,0 +1,34 @@ +[General] +ALWAYS_SAVE_TO_TEAM=local +ALWAYS_SAVE_TO_VAULT=primary +ChangedLocationPath=/home/chris/.local/share/Enpass/Enpass/ +DEVICE_UUID=e2b61cfc-4671-485c-a848-90df077d3a25 +LAST_SELECTED_LANGUAGE=default +QUICKSETUP_SHOWN=true +SELECTED_LANGUAGE=default +assets_copied1=0 +detailPaneTabWidth=0 +masterPaneDesktopWidth=260 +masterPaneTabWidth=240 +sidePaneDesktopWidth=220 + +[Backup] +MajorCount=8 +MinorCount=0 +changedBackupPath=/home/chris/.local/share/Enpass/Backups/ +lastMajorCountTime=1772996878 +lastMinorCountTime=0 + +[%General] +autorunAtSystemStartup6=true +avoidSubscriptionDialog=true +hiddenCategories\size=0 +useDarkTheme=true + +[mainWindow] +height=508 +screen=eDP-1 +visibility=2 +width=941 +x=967 +y=560 diff --git a/initial-configs/nextcloud.cfg b/initial-configs/nextcloud.cfg new file mode 100644 index 0000000..5ecc3c8 --- /dev/null +++ b/initial-configs/nextcloud.cfg @@ -0,0 +1,54 @@ +[General] +clientPreviousVersion= +clientVersion=4.0.6 +confirmExternalStorage=true +desktopEnterpriseChannel=stable +isVfsEnabled=false +launchOnSystemStartup=true +monoIcons=false +moveToTrash=false +newBigFolderSizeLimit=500 +notifyExistingFoldersOverLimit=false +optionalServerNotifications=true +overrideLocalDir= +overrideServerUrl= +promptDeleteAllFiles=false +showCallNotifications=true +showChatNotifications=true +showInExplorerNavigationPane=false +stopSyncingExistingFoldersOverLimit=false +updateChannel=stable +useNewBigFolderSizeLimit=true + +[Accounts] +0\Folders\1\ignoreHiddenFiles=false +0\Folders\1\journalPath=.sync_0a9bf4139ff3.db +0\Folders\1\localPath=/home/chris/Tower/ +0\Folders\1\paused=false +0\Folders\1\targetPath=/ +0\Folders\1\version=2 +0\Folders\1\virtualFilesMode=off +0\authType=webflow +0\dav_user=chris +0\desktopEnterpriseChannel=invalid +0\displayName=chris +0\encryptionCertificateSha256Fingerprint=@ByteArray() +0\networkDownloadLimit=0 +0\networkDownloadLimitSetting=0 +0\networkProxyHostName= +0\networkProxyNeedsAuth=false +0\networkProxyPort=0 +0\networkProxyType=2 +0\networkProxyUser= +0\networkUploadLimit=0 +0\networkUploadLimitSetting=0 +0\serverColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\x82\x82\xc9\xc9\0\0) +0\serverHasValidSubscription=false +0\serverTextColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xff\xff\0\0) +0\serverVersion=32.0.5.0 +0\url=https://tower.scarif.space +0\version=13 +0\webflow_user=chris + +[Nextcloud] +autoUpdateCheck=true