From f0f251c8149aac6f54f23f2d7655a171545075ab Mon Sep 17 00:00:00 2001 From: fwastring Date: Tue, 3 Jun 2025 21:39:19 +0200 Subject: [PATCH] added stuff --- config/base.nix | 61 +++++++++++++++++++++++++++++++++---------- config/home.nix | 31 +--------------------- flake.nix | 4 +-- shared/dmenu.nix | 17 +++++------- shared/dwm.nix | 4 +-- shared/fish.nix | 5 +--- shared/oh-my-posh.nix | 6 ++--- shared/st.nix | 2 +- shared/tmux.nix | 11 +++++--- shared/vscode.nix | 4 --- 10 files changed, 72 insertions(+), 73 deletions(-) diff --git a/config/base.nix b/config/base.nix index 75a93cd..4c0a712 100644 --- a/config/base.nix +++ b/config/base.nix @@ -10,6 +10,7 @@ { imports = [ # ../shared/vial.nix + # ../shared/st.nix ]; nixpkgs = { overlays = [ @@ -26,6 +27,16 @@ users.defaultUserShell = pkgs.bash; documentation.man.generateCaches = false; programs.fish.enable = true; + programs.slock = { + enable = true; + package = with pkgs; (slock.overrideAttrs (oldAttrs: rec { + src = builtins.fetchGit { + url = "https://github.com/fwastring/slock"; + rev = "53ada91fefc22f6c9c76ef71b9741b385b6bedfb"; + }; + buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config xorg.libXrandr xorg.xrandr libxcrypt xorg.libXext xorg.xorgproto]; + })); + }; programs.bash = { interactiveShellInit = '' if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] @@ -85,19 +96,15 @@ environment.sessionVariables = { EDITOR = "nvim"; + VISUAL = "nvim"; TERM = "xterm-256color"; }; time.timeZone = "Europe/Stockholm"; fonts.packages = with pkgs; [ - (nerdfonts.override { - fonts = [ - "Hack" - "FiraCode" - "ComicShannsMono" - ]; - }) + nerd-fonts.comic-shanns-mono + nerd-fonts.fira-code ]; i18n.defaultLocale = "en_US.UTF-8"; @@ -124,12 +131,24 @@ }; }; console.keyMap = "sv-latin1"; + console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; environment.systemPackages = with pkgs; [ + lolcat + fortune + cowsay + pkg-config + xlsfonts + xorg.fontmiscmisc + xorg.mkfontdir + xclip vim git openssh - rofi + dysk + rsync + procs + dust (wrapHelm kubernetes-helm { plugins = with pkgs.kubernetes-helmPlugins; [ helm-secrets @@ -140,17 +159,36 @@ }) k3sup nixfmt-rfc-style + + # LSPs nixd unstable.neovim omnisharp-roslyn nodePackages.vscode-json-languageserver tailwindcss-language-server - dmenu + dockerfile-language-server-nodejs + nodejs_22 + bash-language-server + (st.overrideAttrs (oldAttrs: rec { + src = builtins.fetchGit { + url = "https://github.com/fwastring/st"; + rev = "9b95aafa2bcb3f4f991a5fc2c7cb939ce3f550b2"; + }; + buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config]; + })) + (dmenu.overrideAttrs (oldAttrs: rec { + src = builtins.fetchGit { + url = "https://github.com/fwastring/dmenu"; + rev = "2f09f9ead8c2736dbca838393f97e5a0e4e55a2e"; + }; + buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config]; + })) ]; services = { picom.enable = true; + clipmenu.enable = true; openssh = { enable = true; }; @@ -173,11 +211,6 @@ enable = true; }; }; - locate = { - enable = true; - package = pkgs.mlocate; - localuser = null; - }; blueman = { enable = true; }; diff --git a/config/home.nix b/config/home.nix index d6474fd..e053506 100644 --- a/config/home.nix +++ b/config/home.nix @@ -59,7 +59,6 @@ bat bluez bluez-tools - unstable.betterlockscreen # tmux fzf eza @@ -72,24 +71,18 @@ wireguard-tools acpi light + # dmenu-rs-enable-plugins # Dev - unstable.fluxcd argocd gh - unstable.deno - unstable.hugo - unstable.logstash ngrok tailwindcss - nodejs_23 yarn plantuml go templ goa - azuredatastudio - mdbtools prettierd #Tools @@ -100,28 +93,7 @@ lazydocker kubectl - #LSP - # roslyn - # roslyn-ls - dockerfile-language-server-nodejs - docker-compose-language-service - bash-language-server - python312Packages.python-lsp-server - yaml-language-server - lua-language-server - typescript - nil - jdt-language-server - texlab - marksman - tree-sitter - vue-language-server - typescript-language-server - gopls - rust-analyzer - # UI - # rofi-bluetooth pastel imagemagick @@ -147,7 +119,6 @@ poppler_utils #Desktop - fluent-reader unstable.feishin libreoffice unstable.signal-desktop diff --git a/flake.nix b/flake.nix index 23e38cc..d07c77f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; fw-pkgs.url = "github:fwastring/fwpkgs/main"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/shared/dmenu.nix b/shared/dmenu.nix index 7cbc71c..c1e49bf 100644 --- a/shared/dmenu.nix +++ b/shared/dmenu.nix @@ -1,16 +1,13 @@ { pkgs, lib, ... }: let dmenu = pkgs.dmenu.overrideAttrs (old: { - src = builtins.fetchGit { - url = "https://github.com/FredzyW/dmenu.git"; - rev = "7ec109778998462a6762745c65c47a73283b810e"; - }; - nativeBuildInputs = with pkgs; [ - xorg.libX11.dev - xorg.libXft - imlib2 - xorg.libXinerama - ]; + # nativeBuildInputs = with pkgs; [ + # xorg.libX11.dev + # xorg.libXft + # imlib2 + # xorg.libXinerama + # ]; + patches = [ ../config/dmenu-center.diff ]; }); in { diff --git a/shared/dwm.nix b/shared/dwm.nix index 6e45446..db296c4 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -8,7 +8,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "f70f48bdb01df6bae9c63131a6c84e812141788c"; + rev = "e9d94d70c3865a1289c20382df21acc3a138ed88"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev @@ -23,7 +23,7 @@ let url = "https://github.com/FredzyW/dwmblocks.git"; rev = "d60ccc8c1180aa617fb1033bf1e44a2866647764"; }; - }) + }); in { home.packages = [ diff --git a/shared/fish.nix b/shared/fish.nix index b92dfe5..35c1dcd 100644 --- a/shared/fish.nix +++ b/shared/fish.nix @@ -28,10 +28,6 @@ name = "done"; src = pkgs.fishPlugins.done.src; } - { - name = "sponge"; - src = pkgs.fishPlugins.sponge.src; - } { name = "grc"; src = pkgs.fishPlugins.grc.src; @@ -39,6 +35,7 @@ ]; shellAbbrs = { homec = "nvim ~/nix/config/home.nix"; + cat = "bat"; n = "eza -l --no-time --no-permissions --no-user"; ls = "eza -l --no-time --no-permissions --no-user"; dev = "nix develop --command fish"; diff --git a/shared/oh-my-posh.nix b/shared/oh-my-posh.nix index 07a882b..d92ec50 100644 --- a/shared/oh-my-posh.nix +++ b/shared/oh-my-posh.nix @@ -105,7 +105,7 @@ "{{if gt .Code 0}}p:red{{end}}" "{{if eq .Code 0}}p:green{{end}}" ]; - "template"= ""; + "template"= ">"; } ]; } @@ -118,7 +118,7 @@ "{{if gt .Code 0}}p:red{{end}}" "{{if eq .Code 0}}p:green{{end}}" ]; - "template"= " "; + "template"= ">"; }; "secondary_prompt"= { "background"= "transparent"; @@ -126,7 +126,7 @@ "{{if gt .Code 0}}p:red{{end}}" "{{if eq .Code 0}}p:green{{end}}" ]; - "template"= " "; + "template"= ">"; }; }; }; diff --git a/shared/st.nix b/shared/st.nix index d2feed5..ce72a49 100644 --- a/shared/st.nix +++ b/shared/st.nix @@ -4,7 +4,7 @@ (st.overrideAttrs (oldAttrs: rec { src = builtins.fetchGit { url = "https://github.com/fwastring/st"; - rev = "384ca157dbedaccf5939d75a6a2ea8137df5862d"; + rev = "2c6e38d2e735116e902962d03e8d7c88db8094bd"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config]; })) diff --git a/shared/tmux.nix b/shared/tmux.nix index bcfeaae..8f10cb4 100644 --- a/shared/tmux.nix +++ b/shared/tmux.nix @@ -7,6 +7,8 @@ tmuxPlugins.sensible tmuxPlugins.pain-control tmuxPlugins.sessionist + tmuxPlugins.yank + # tmuxPlugins.copycat { plugin = tmuxPlugins.continuum; extraConfig = '' @@ -23,14 +25,17 @@ ]; prefix = "C-a"; - terminal = "alacritty"; + terminal = "st"; keyMode = "vi"; escapeTime = 0; extraConfig = '' + set -g set-clipboard on + set -g @yank_selection_mouse 'clipboard' set -g base-index 1 + set -g status-keys 'vi' setw -g pane-base-index 1 - set -g default-terminal "xterm-kitty" - set -g terminal-overrides "xterm-kitty" + set -g default-terminal "st-256color" + set -g terminal-overrides "st-256color" # true colours support # set -ga terminal-overrides ",*256col*:Tc" set -ga terminal-overrides ",xterm-256color:Tc" diff --git a/shared/vscode.nix b/shared/vscode.nix index 81ad387..33ff6fa 100644 --- a/shared/vscode.nix +++ b/shared/vscode.nix @@ -2,10 +2,6 @@ { programs.vscode = { enable = true; - extensions = with pkgs.vscode-extensions; [ - vscodevim.vim - jebbs.plantuml - ]; }; }