diff --git a/README.md b/README.md index 68be3ff..b3e29a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ❄️ NixOS Dotfiles -![Screenshot of my desktop](splash.png) +![Screenshot of my desktop](splash.webp) ## Information diff --git a/flake-modules/allowed.nix b/flake-modules/allowed.nix index cd09118..f6bee5c 100644 --- a/flake-modules/allowed.nix +++ b/flake-modules/allowed.nix @@ -1,6 +1,6 @@ - { unfree = [ + "antigravity" "cursor" "discord" "spotify" @@ -10,8 +10,6 @@ "zoom-us" "zoom" - # since the predicate ist to be set in the flake and not in a module - # it is impossible to make the list dynamic and respect nvidia.enable "nvidia-x11" "nvidia-settings" "nvidia-persistenced" @@ -41,8 +39,5 @@ "vscode-extension-mhutchie-git-graph" ]; - - inecure = [ - # "electron-25.9.0" - ]; + insecure = [ ]; } diff --git a/flake.lock b/flake.lock index 4bae71b..9d72a65 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762095388, - "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=", + "lastModified": 1763901903, + "narHash": "sha256-w7YsxTjldwhUBP5ypbcZvWyZgRQqp3NBfyk5BAfrFjQ=", "owner": "9001", "repo": "copyparty", - "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae", + "rev": "fb9f0441c99833ab7bc035d76b9a89021270675a", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1763427561, - "narHash": "sha256-7m7/uCNhBwUAB26QZs/pvFi1wlzpImnNCEF+a883oOs=", + "lastModified": 1763912895, + "narHash": "sha256-1mdM539nkqTWVHTHPCGHGrLu/UwsxeYWnrnHQaUh1qQ=", "ref": "refs/heads/main", - "rev": "edc311544a54a06ce4acb759b4d9a30853695452", - "revCount": 6618, + "rev": "2b0fd417d32278159d0ca1d23fb997588c37995b", + "revCount": 6643, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -627,11 +627,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1763385941, - "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=", + "lastModified": 1763738061, + "narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "cc6483354b236c2fc95cc1d4ba1f0f40b7345e69", + "rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1763477650, - "narHash": "sha256-PM2ykDLxh6V7cVFjn8WxmZjuogJK0VHTTLexu8LUtQs=", + "lastModified": 1763929585, + "narHash": "sha256-uxJ8vJoupgc3oJYOK3UV/kbi1f4mXFsh1BuuozhZpfw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9bfdb3ed05b5b2df8226d31e256d8ee4c53edde", + "rev": "a5f13fe8d33e5dd3585980b288366665d35ed379", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -801,11 +801,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ ] }, "locked": { - "lastModified": 1763417348, - "narHash": "sha256-n5xDOeNN+smocQp3EMIc11IzBlR9wvvTIJZeL0g33Fs=", + "lastModified": 1763870012, + "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f66a7fb9626a9a9c077612ef10a0ce396286c7d", + "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763445380, - "narHash": "sha256-TGTZb9kJKq+z1Gn+39U9v6Ltsog2LhI7mZdf8/jcON4=", + "lastModified": 1763600401, + "narHash": "sha256-druDd9HC3UxZSzCY+qaFp9QDCGfzrhv+Zrytia6lJUE=", "owner": "sxyazi", "repo": "yazi", - "rev": "f9abe886ccfc801348be73f62c863beb87fd0bb0", + "rev": "a08b345a02c6b4c65239a0522f67e77a0132e88b", "type": "github" }, "original": { diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 63bb135..0a180fb 100644 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/git.nix b/home-modules/git.nix index 1e9d2d5..7cd99ae 100644 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -21,10 +21,10 @@ }; extraConfig = { credential = { - "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxDCS") "lkurzweg"; - "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxDCS") "Test"; + "https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg"; + "https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test"; }; - url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxDCS") "https://git.da.dicos.de/"; + url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host == "NxDCS") "https://git.da.dicos.de/"; url."ssh://git@github.com/".insteadOf = "https://github.com/"; pull.rebase = false; # true }; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 8acc6c3..127f811 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -163,8 +163,8 @@ in { blur = { enabled = true; - size = "10"; - passes = "2"; + size = "2"; + passes = "4"; xray = false; vibrancy = 0.5; ignore_opacity = true; @@ -215,7 +215,7 @@ in { exec-once = [ "waybar" "swww-daemon" - "hyprland-autoname-workspaces" + # "hyprland-autoname-workspaces" "/usr/lib/polkit-kde-authentication-agent-1 " "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "syncthing -no-browser" @@ -603,7 +603,9 @@ in { submap = screenshot ${action_simple { key = "W"; cmd = ''exec,hyprshot -m window''; }} ${action_simple { key = "M"; cmd = ''exec,hyprshot -m output''; }} + ${action_simple { key = "S"; cmd = ''exec,hyprshot -m output''; }} ${action_simple { key = "R"; cmd = ''exec,hyprshot -m region''; }} + ${action_simple { key = "A"; cmd = ''exec,hyprshot -m region''; }} bind = , Escape, execr, submap_indicator unset bind = , Escape, submap, reset submap = reset diff --git a/home-modules/opencode.nix b/home-modules/opencode.nix index 4030b94..eb4f557 100644 --- a/home-modules/opencode.nix +++ b/home-modules/opencode.nix @@ -1,29 +1,29 @@ { pkgs, ... }@all: with all; { home = { packages = with pkgs; [ - opencode + unstable.opencode ]; - file.".config/opencode/opencode.json".text = let - model = "qwen2.5-coder:7b"; - in builtins.toJSON { - "$schema" = "https://opencode.ai/config.json"; - model = "ollama/${model}"; - theme = "matrix"; - provider = { - ollama = { - name = "Ollama (local)"; - npm = "@ai-sdk/openai-compatible"; - options = { - baseURL = "http://localhost:11434/v1"; - }; - models = { - "${model}" = { - tools = true; - }; - }; - }; - }; - }; + # file.".config/opencode/opencode.json".text = let + # model = "qwen2.5-coder:7b"; + # in builtins.toJSON { + # "$schema" = "https://opencode.ai/config.json"; + # model = "ollama/${model}"; + # theme = "matrix"; + # provider = { + # ollama = { + # name = "Ollama (local)"; + # npm = "@ai-sdk/openai-compatible"; + # options = { + # baseURL = "http://localhost:11434/v1"; + # }; + # models = { + # "${model}" = { + # tools = true; + # }; + # }; + # }; + # }; + # }; }; } diff --git a/home-modules/pkgs-list/programs.nix b/home-modules/pkgs-list/programs.nix index 5932568..e08b467 100644 --- a/home-modules/pkgs-list/programs.nix +++ b/home-modules/pkgs-list/programs.nix @@ -12,6 +12,7 @@ ] ++ (if (hyper.host != "NxACE") then [ signal-desktop unstable.code-cursor-fhs + latest.antigravity obsidian zoom-us inkscape diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index 044b7ef..c34df5e 100644 --- a/home-modules/ssh.nix +++ b/home-modules/ssh.nix @@ -17,6 +17,7 @@ "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}" "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" "${hyper.home}/vault/ssh/tg-dm-informatik-tuda" + (pkgs.lib.mkIf (hyper.host == "NxDCS") "${hyper.home}/vault/ssh/dcsgit-lkurzweg-${hyper.host}") ]; "github.com".identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ]; "nxace" = nxace "nxace"; diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index 2bf9517..4bc11cd 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -30,24 +30,24 @@ in { { on = ""; run = "arrow 100%"; desc = "Move cursor down one page"; } { on = ""; run = "arrow -100%"; desc = "Move cursor up one page"; } { on = ""; run = "arrow 100%"; desc = "Move cursor down one page"; } - { on = [ "g" "g" ]; run = "arrow top"; desc = "Move cursor to the top"; } - { on = [ "g" "e" ]; run = "arrow bot"; desc = "Move cursor to the end"; } - { on = [ "g" "h" ]; run = "cd ~"; desc = "Go to the home directory"; } - { on = [ "g" "n" ]; run = "cd ~/nix-dots"; desc = "Go to the Nix-Dotfiles directory"; } - (pkgs.lib.mkIf (hyper.host == "NxACE") { on = [ "g" "s" ]; run = "cd /var/lib/hugo/nx2site"; desc = "Go to the Hugo Nx2.Site directory"; }) - { on = [ "g" "n" ]; run = "cd /nix/store"; desc = "Go to the Nix-Store"; } - { on = [ "g" "c" ]; run = "cd ~/.config"; desc = "Go to the config directory"; } - { on = [ "g" "l" ]; run = "cd ~/.locale"; desc = "Go to the .locale directory"; } { on = [ "g" "C" ]; run = "cd ~/.cache"; desc = "Go to the .cache directory"; } - { on = [ "g" "m" ]; run = "cd ~/media"; desc = "Go to the media (udiskie mount) directory"; } - { on = [ "g" "v" ]; run = "cd ~/Videos"; desc = "Go to the Videos directory"; } - { on = [ "g" "t" ]; run = "cd /tmp"; desc = "Go to the /tmp directory"; } - { on = [ "g" "d" ]; run = "cd ~/Downloads"; desc = "Go to the downloads directory"; } + { on = [ "g" "c" ]; run = "cd ~/.config"; desc = "Go to the config directory"; } { on = [ "g" "D" ]; run = "cd ~/Documents"; desc = "Go to the Documents directory"; } - { on = [ "g" "r" ]; run = "cd /"; desc = "Go to the root (/) directory"; } + { on = [ "g" "d" ]; run = "cd ~/Downloads"; desc = "Go to the downloads directory"; } + { on = [ "g" "e" ]; run = "arrow bot"; desc = "Move cursor to the end"; } + { on = [ "g" "g" ]; run = "arrow top"; desc = "Move cursor to the top"; } + { on = [ "g" "h" ]; run = "cd ~"; desc = "Go to the home directory"; } + { on = [ "g" "l" ]; run = "cd ~/.locale"; desc = "Go to the .locale directory"; } + { on = [ "g" "m" ]; run = "cd ~/media"; desc = "Go to the media (udiskie mount) directory"; } + { on = [ "g" "n" ]; run = "cd ~/nix-dots"; desc = "Go to the Nix-Dotfiles directory"; } + { on = [ "g" "N" ]; run = "cd /nix/store"; desc = "Go to the Nix-Store"; } { on = [ "g" "p" ]; run = "cd ~/projects"; desc = "Go to the projects directory"; } + { on = [ "g" "r" ]; run = "cd /"; desc = "Go to the root (/) directory"; } { on = [ "g" "/" ]; run = "cd /"; desc = "Go to the root (/) directory"; } + { on = [ "g" "t" ]; run = "cd /tmp"; desc = "Go to the /tmp directory"; } + { on = [ "g" "v" ]; run = "cd ~/Videos"; desc = "Go to the Videos directory"; } { on = [ "g" "" ]; run = "cd --interactive"; desc = "Go to a directory interactively"; } + (pkgs.lib.mkIf (hyper.host == "NxACE") { on = [ "g" "s" ]; run = "cd /var/lib/hugo/nx2site"; desc = "Go to the Hugo Nx2.Site directory"; }) # Navigation { on = "h"; run = "leave"; desc = "Go back to the parent directory"; } { on = "l"; run = "enter"; desc = "Enter the child directory"; } @@ -70,8 +70,7 @@ in { { on = "O"; run = "open --interactive"; desc = "Open selected files interactively"; } { on = ""; run = "open"; desc = "Open selected files"; } { on = ""; run = "open --interactive"; desc = "Open selected files interactively"; } - { on = "y"; run = [ ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'' - "yank" ]; desc = "Yank selected files (copy)"; } + { on = "y"; run = [ ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'' "yank" ]; desc = "Yank selected files (copy)"; } { on = "y"; run = "yank"; desc = "Yank selected files (copy)"; } { on = "x"; run = "yank --cut"; desc = "Yank selected files (cut)"; } { on = "p"; run = "paste"; desc = "Paste yanked "; } @@ -158,6 +157,7 @@ in { { on = "{"; run = "tab_swap -1"; desc = "Swap current tab with previous tab"; } { on = "{"; run = "tab_swap -1"; desc = "Swap current tab wittab"; } { on = "}"; run = "tab_swap 1"; desc = "Swap current tab with next tab"; } + { on = ""; run = "spot"; desc = "Show Spot View"; } # Tasks { on = "w"; run = "tasks:show"; desc = "Show Task View"; } ]; @@ -168,8 +168,8 @@ in { { on = ""; run = "close"; desc = "Close Task View"; } { on = "c"; run = "cancel"; desc = "Cancel Task"; } { on = "i"; run = "inspect"; desc = "Inspect Task"; } - { on = "j"; run = "arrow -1"; desc = "Up in list"; } - { on = "k"; run = "arrow 1"; desc = "Down in list"; } + { on = "k"; run = "arrow -1"; desc = "Up in list"; } + { on = "j"; run = "arrow 1"; desc = "Down in list"; } { on = "u"; run = "arrow -5"; desc = "Up in list (fast)"; } { on = "d"; run = "arrow 5"; desc = "Down in list (fast)"; } ]; @@ -179,6 +179,19 @@ in { { on = "?"; run = "help"; desc = "Open help"; } { on = ""; run = "help"; desc = "Open help"; } ]; + spot.keymap = [ + # Spot + { on = ""; run = "close"; desc = "Close Spot View"; } + { on = "q"; run = "close"; desc = "Close Spot View"; } + { on = ""; run = "close"; desc = "Close Spot View"; } + { on = "k"; run = "arrow -1"; desc = "Up in list"; } + { on = "j"; run = "arrow 1"; desc = "Down in list"; } + { on = "u"; run = "arrow -5"; desc = "Up in list (fast)"; } + { on = "d"; run = "arrow 5"; desc = "Down in list (fast)"; } + { on = [ "g" "g" ]; run = "arrow top"; desc = "Move cursor to the top"; } + { on = [ "g" "e" ]; run = "arrow bot"; desc = "Move cursor to the end"; } + { on = "c"; run = "copy cell"; desc = "Copy Selected Cell"; } + ]; }; settings = { mgr = { @@ -193,74 +206,76 @@ in { }; opener = { "edit" = [ - { run = ''hx "$@"''; desc = "helix"; block = true; } - { run = ''codium "$@"''; desc = "code"; orphan = true; } + { run = ''hx "$0" "$@"''; desc = "Helix"; block = true; } + { run = ''codium "$0" "$@"''; desc = "VS Code"; orphan = true; } + { run = ''antigravity "$0" "$0"''; desc = "Antigravity"; orphan = true; } + { run = ''cat "$0" "$@" | wl-copy''; desc = "Copy Contents"; } ]; "play" = [ - { run = ''mpv "$@"''; desc = "mpv"; orphan = true; } - { run = ''mpv --vf=negate "$@"''; desc = "mpv inverted"; orphan = true; } - { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo"; } + { run = ''mpv "$0" "$@"''; desc = "mpv"; orphan = true; } + { run = ''mpv --vf=negate "$0" "$@"''; desc = "mpv inverted"; orphan = true; } + { run = ''mediainfo "$0"; echo "Press enter to return to yazi"; read''; block = true; desc = "Show mediainfo"; } ]; "archive" = [ - { run = ''unar "$1"''; desc = "Extract here"; } - { run = ''tar -x "$1"''; desc = "tar -x"; } - { run = ''unzip "$1"''; desc = "unzip"; } + { run = ''unar "$0" "$@"''; desc = "Extract here"; } + { run = ''tar -x "$0" "$@"''; desc = "tar -x"; } + { run = ''unzip "$0" "$@"''; desc = "unzip"; } ]; "image" = [ - { run = ''imv "$@"''; desc = "imv"; orphan = true; } - { run = ''gimp "$@"''; desc = "gimp"; orphan = true; } + { run = ''imv "$0" "$@"''; desc = "imv"; orphan = true; } + { run = ''gimp "$0" "$@"''; desc = "gimp"; orphan = true; } { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; } - { run = ''exiftool "$@"; echo "Press enter to exit"; read''; desc = "View Exif Data"; } - { run = ''for f in "$@"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; } + { run = ''exiftool "$0"; echo "Press enter to return to yazi"; read''; desc = "View Exif Data"; } + { run = ''for f in "$0"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; } ]; "svg" = [ - { run = ''inkscape "$@"''; desc = "inkscape"; orphan = true; } - { run = ''firefox "$@"''; desc = "firefox"; orphan = true; } + { run = ''inkscape "$0" "$@"''; desc = "inkscape"; orphan = true; } + { run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; } ]; "font" = [ - { run = ''fontpreview "$@"''; desc = "fontpreview"; orphan = true; } - { run = ''fontforge "$@"''; desc = "fortforge"; orphan = true; } + { run = ''fontpreview "$0" "$@"''; desc = "fontpreview"; orphan = true; } + { run = ''fontforge "$0" "$@"''; desc = "fortforge"; orphan = true; } ]; "document" = [ - { run = ''zathura "$@"''; desc = "zathura"; orphan = true; } - { run = ''xournal "$@"''; desc = "xournal"; orphan = true; } - { run = ''firefox "$@"''; desc = "firefox"; orphan = true; } - { run = ''nxgs flip "$@"''; desc = "nxgs flip"; } - { run = ''nxgs rotate "$@"''; desc = "nxgs rotate"; } - { run = ''nxgs interactive-merge "$@"''; block = true; desc = "nxgs merge"; } + { run = ''zathura "$0" "$@"''; desc = "zathura"; orphan = true; } + { run = ''xournal "$0" "$@"''; desc = "xournal"; orphan = true; } + { run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; } + { run = ''nxgs flip "$0" "$@"''; desc = "nxgs flip"; } + { run = ''nxgs rotate "$0" "$@"''; desc = "nxgs rotate"; } + { run = ''nxgs interactive-merge "$0" "$@"''; block = true; desc = "nxgs merge"; } ]; "browser" = [ - { run = ''firefox "$@"''; desc = "firefox"; orphan = true; } - { run = ''zen "$@"''; desc = "zen"; orphan = true; } - { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "chromium"; orphan = true; } - { run = ''w3m "$@"''; desc = "w3m"; } - { run = ''lynx "$@"''; desc = "lynx"; } + { run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; } + { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$0" "$@"''; desc = "chromium"; orphan = true; } + { run = ''w3m "$0" "$@"''; desc = "w3m"; } + { run = ''lynx "$0" "$@"''; desc = "lynx"; } ]; "office" = [ - { run = ''libreoffice "$@"''; desc = "libreoffice"; orphan = true; } - { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; orphan = true; } + { run = ''libreoffice "$0" "$@"''; desc = "libreoffice"; orphan = true; } + { run = ''libreoffice --view "$0" "$@"''; desc = "libreoffice read-only"; orphan = true; } ]; "shell" = [ - { run = ''bash -c "$@"''; desc = "bash -c"; } - { run = ''fish -c "$@"''; desc = "fish -c"; } - { run = ''sh -c "$@"''; desc = "sh -c"; } + { run = ''bash -c "$0"; echo "Press enter to return to yazi"; read''; desc = "bash -c"; } + { run = ''fish -c "$0"; echo "Press enter to return to yazi"; read''; desc = "fish -c"; } + { run = ''sh -c "$0"; echo "Press enter to return to yazi"; read''; desc = "sh -c"; } ]; "python" = [ - { run = ''python "$@"''; desc = "python"; } + { run = ''python "$@"; echo "Press enter to return to yazi"; read''; desc = "python"; block = true; } ]; "directory" = [ - { run = ''lazygit "$@"''; desc = "python"; } + { run = ''lazygit "$0"''; desc = "lazygit"; } ]; }; open.rules = [ { mime = "text/html"; use = [ "edit" "browser" ]; } { mime = "text/htm"; use = [ "edit" "browser" ]; } - { mime = "text/x-python"; use = "python"; } + { mime = "text/x-script.python"; use = [ "edit" "python" ]; } + { mime = "text/script.python"; use = [ "edit" "python" ]; } { mime = "text/*"; use = "edit"; } { mime = "text"; use = "edit"; } - { mine = "inode/x-empty"; use = "edit"; } - { mine = "inode/directory"; use = "edit"; } + { mine = "inode/x-empty"; use = "directory"; } + { mine = "inode/directory"; use = "directory"; } { mime = "image/*"; use = "image"; } { mime = "image/svg"; use = [ "image" "edit" ]; } @@ -311,8 +326,6 @@ in { tabs = { active = { fg = secondary.dark; bg = secondary.base; }; inactive = { fg = secondary.base; bg = secondary.dark; }; - # sep_inner = - # sep_outer = }; status = { separator_open = " "; #""; diff --git a/shell-only.nix b/shell-only.nix index 8341478..2d37815 100644 --- a/shell-only.nix +++ b/shell-only.nix @@ -30,7 +30,7 @@ home = { username = hyper.user; homeDirectory = hyper.home; - stateVersion = pkgs.version; + stateVersion = hyper.pkgs-version; }; xdg = { enable = true; diff --git a/splash.png b/splash.png deleted file mode 100644 index 26b77f3..0000000 Binary files a/splash.png and /dev/null differ diff --git a/splash.webp b/splash.webp new file mode 100644 index 0000000..7481768 Binary files /dev/null and b/splash.webp differ diff --git a/wsl.nix b/wsl.nix index c6a4ab6..5da4fe1 100644 --- a/wsl.nix +++ b/wsl.nix @@ -1,7 +1,6 @@ { pkgs, ... }@all: with all; { imports = [ inputs.nixos-wsl.nixosModules.default - ./system-modules/base-packages.nix ./system-modules/docker.nix ./system-modules/gc.nix ./system-modules/gpg.nix @@ -9,7 +8,8 @@ ./system-modules/nixd.nix ./system-modules/users.nix ]; - system.stateVersion = pkgs.version; + environment.systemPackages = import ./system-modules/base-packages.nix pkgs; + system.stateVersion = hypr.pkgs-version; wsl = { defaultUser = hyper.user; enable = true;