From 090fb01c0a21695f63e8f5e7875f8c7d656f4221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Sat, 28 Mar 2026 13:55:32 +0100 Subject: [PATCH] openscad & kitty enable nvim openscad and switch to kitty --- builds/printer.nix | 14 +++- configuration.nix | 3 +- flake.lock | 93 ++++++++++++++++++++++- flake.nix | 2 + home/default.nix | 2 +- home/programs/alacritty.nix | 18 ----- home/programs/default.nix | 2 +- home/programs/filebrowser.nix | 53 ++++++++++++- home/programs/kitty.nix | 5 ++ home/programs/nixvim/plugins/conform.nix | 15 ---- home/programs/nixvim/plugins/openscad.nix | 14 +++- home/programs/river/default.nix | 2 +- home/themes/catppuccin/default.nix | 4 +- 13 files changed, 182 insertions(+), 45 deletions(-) delete mode 100644 home/programs/alacritty.nix diff --git a/builds/printer.nix b/builds/printer.nix index d687af8..fc89f66 100644 --- a/builds/printer.nix +++ b/builds/printer.nix @@ -1,7 +1,19 @@ { pkgs, ... }: { - services.printing.drivers = [ pkgs.epson-escpr ]; + environment.systemPackages = with pkgs; [ + gutenprint + ]; + + services.printing = { + enable = true; + listenAddresses = [ "*:631" ]; + allowFrom = [ "all" ]; + browsing = true; + defaultShared = true; + openFirewall = true; + drivers = [ pkgs.epson-escpr ]; + }; hardware.printers = { ensurePrinters = [ { diff --git a/configuration.nix b/configuration.nix index f0d8360..75ea94d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -71,7 +71,6 @@ in defaultSession = "river"; }; libinput.enable = true; # Enable touchpad. - printing.enable = true; }; programs = { @@ -184,5 +183,5 @@ in allowUnfree = true; permittedInsecurePackages = [ "electron-32.3.3" ]; }; - system.stateVersion = "23.11"; + system.stateVersion = "26.05"; } diff --git a/flake.lock b/flake.lock index 6621a90..3276a62 100644 --- a/flake.lock +++ b/flake.lock @@ -81,6 +81,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -221,6 +239,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1772419343, + "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -271,7 +305,29 @@ "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "yazi": "yazi" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "yazi", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772420823, + "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "sops-nix": { @@ -308,6 +364,41 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "yazi": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1774567340, + "narHash": "sha256-skKD1hvAvilKkK406RgNl6X/YJgkSsoZmtHmdfeoyWI=", + "owner": "sxyazi", + "repo": "yazi", + "rev": "935eb6b2989f8a7ce219a2a71a539365c8dccfbb", + "type": "github" + }, + "original": { + "owner": "sxyazi", + "repo": "yazi", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3091b31..f564f41 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + yazi.url = "github:sxyazi/yazi"; }; outputs = @@ -45,6 +46,7 @@ nixvim, nur, sops-nix, + yazi, ... }@inputs: { diff --git a/home/default.nix b/home/default.nix index 660bcb4..4c583dd 100644 --- a/home/default.nix +++ b/home/default.nix @@ -52,7 +52,7 @@ sops ]; - stateVersion = "23.11"; + stateVersion = "26.05"; }; programs.home-manager.enable = true; diff --git a/home/programs/alacritty.nix b/home/programs/alacritty.nix deleted file mode 100644 index 929a63b..0000000 --- a/home/programs/alacritty.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - fira-code - ]; - - programs.alacritty = { - enable = true; - - settings.font = { - size = 8; - normal.family = "Fira Code"; - bold.family = "Fira Code"; - italic.family = "Fira Code"; - }; - }; -} diff --git a/home/programs/default.nix b/home/programs/default.nix index 79a51b5..4df6b40 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,7 +1,6 @@ { imports = [ ./3dprint.nix - ./alacritty.nix ./anki.nix ./calibre.nix ./digikam.nix @@ -11,6 +10,7 @@ ./hyprlock.nix ./imv.nix ./inkscape.nix + ./kitty.nix ./libreoffice.nix ./messenger.nix ./nixvim diff --git a/home/programs/filebrowser.nix b/home/programs/filebrowser.nix index 5637bbe..18ad377 100644 --- a/home/programs/filebrowser.nix +++ b/home/programs/filebrowser.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { home.packages = with pkgs; [ @@ -8,8 +8,57 @@ kdePackages.baloo nautilus udisks - yazi ]; xdg.configFile."menus/applications.menu".source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; + + # ── Yazi ────────────────────────────────────────────────────────────── + programs.yazi = { + enable = true; + package = inputs.yazi.packages.${pkgs.stdenv.hostPlatform.system}.default; + enableZshIntegration = true; + settings = { + yazi = { + ratio = [ + 1 + 4 + 3 + ]; + sort_by = "natural"; + sort_sensitive = true; + sort_reverse = false; + sort_dir_first = true; + linemode = "none"; + show_hidden = true; + show_symlink = true; + }; + + preview = { + image_filter = "lanczos3"; + image_quality = 90; + tab_size = 1; + max_width = 600; + max_height = 900; + cache_dir = ""; + ueberzug_scale = 1; + ueberzug_offset = [ + 0 + 0 + 0 + 0 + ]; + }; + + tasks = { + micro_workers = 5; + macro_workers = 10; + bizarre_retry = 5; + }; + }; + }; + + programs.zoxide = { + enable = true; + enableZshIntegration = true; + }; } diff --git a/home/programs/kitty.nix b/home/programs/kitty.nix index 46e5352..d237e92 100644 --- a/home/programs/kitty.nix +++ b/home/programs/kitty.nix @@ -11,6 +11,11 @@ programs.kitty = { enable = true; + font = { + size = 6; + name = "Fira Code"; + package = pkgs.fira-code; + }; settings = { clear_all_shortcuts = true; enabled_layouts = "splits:slit_axis=horizontal,stack"; diff --git a/home/programs/nixvim/plugins/conform.nix b/home/programs/nixvim/plugins/conform.nix index f975beb..8abe1a7 100644 --- a/home/programs/nixvim/plugins/conform.nix +++ b/home/programs/nixvim/plugins/conform.nix @@ -50,12 +50,6 @@ tex = [ "tex-fmt" ]; - openscad = [ - "squeeze_blanks" - "trim_whitespace" - "trim_newlines" - "scadstyle" - ]; "_" = [ "squeeze_blanks" "trim_whitespace" @@ -103,15 +97,6 @@ tex-fmt = { command = "tex-fmt"; }; - scadstyle = { - "inherit" = true; - prepend_args = [ - "--indent-type" - "Spaces" - "--indent-width" - "2" - ]; - }; }; }; }; diff --git a/home/programs/nixvim/plugins/openscad.nix b/home/programs/nixvim/plugins/openscad.nix index 2f9d01a..1860dce 100644 --- a/home/programs/nixvim/plugins/openscad.nix +++ b/home/programs/nixvim/plugins/openscad.nix @@ -1,5 +1,17 @@ { ... }: { - programs.nixvim.plugins.openscad.enable = true; + programs.nixvim.plugins.openscad = { + enable = true; + luaConfig.post = '' + vim.g.openscad_fuzzy_finder = 'skim' + -- when the pdf_command is run, the last argument will be the pdf filename + vim.g.openscad_pdf_command = 'zathura' + vim.g.openscad_cheatsheet_window_blend = 15 --% + vim.g.openscad_load_snippets = false + -- should the openscad project automatically be opened on startup + vim.g.openscad_auto_open = false + vim.g.openscad_default_mappings = true + ''; + }; } diff --git a/home/programs/river/default.nix b/home/programs/river/default.nix index ba727bd..1c5aa2f 100644 --- a/home/programs/river/default.nix +++ b/home/programs/river/default.nix @@ -66,7 +66,7 @@ }; map = { normal = { - "Super+Shift Return" = "spawn alacritty"; + "Super+Shift Return" = "spawn kitty"; # System "Super P" = "spawn 'rofi -show drun'"; "Super+Shift C" = "close"; diff --git a/home/themes/catppuccin/default.nix b/home/themes/catppuccin/default.nix index cd79868..9618d96 100644 --- a/home/themes/catppuccin/default.nix +++ b/home/themes/catppuccin/default.nix @@ -14,7 +14,7 @@ in ./hyprlock.nix ./nvim.nix ./taskwarrior.nix - # ./qt.nix + ./qt.nix ]; catppuccin = { @@ -22,12 +22,12 @@ in flavor = "mocha"; accent = "pink"; - alacritty.enable = true; anki.enable = true; element-desktop.enable = true; firefox.enable = true; fzf.enable = true; imv.enable = true; + kitty.enable = true; lazygit.enable = true; rofi.enable = true; spotify-player.enable = true;