diff --git a/config/base.nix b/config/base.nix index b1d8fcb..e3d647f 100644 --- a/config/base.nix +++ b/config/base.nix @@ -22,8 +22,6 @@ nix.nixPath = ["/etc/nix/path"]; users.defaultUserShell = pkgs.bash; documentation.man.generateCaches = false; - # environment.systemPackages = with pkgs; [ - # ]; systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; programs.fish.enable = true; programs.bash = { @@ -102,37 +100,10 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # boot.extraModulePackages = [ - # config.boot.kernelPackages.wireguard - # ]; console.keyMap = "sv-latin1"; - # systemd.services.vdirsyncer = { - # serviceConfig.Type = "oneshot"; - # serviceConfig.User = "fw"; - # path = with pkgs; [ vdirsyncer ]; - # script = '' - # vdirsyncer -c "/home/fw/.config/vdirsyncer/config" sync - # ''; - # }; - # systemd.timers.vdirsyncer = { - # wantedBy = [ "timers.target" ]; - # partOf = [ "vdirsyncer.service" ]; - # timerConfig = { - # OnBootSec = "5m"; - # OnUnitActiveSec = "5m"; - # Unit = "vdirsyncer.service"; - # }; - # }; - environment.systemPackages = with pkgs; [ - # wireguard-go - pulsemixer openssh - pinentry-curses - spotify-qt - wireguard-tools - (firefox.override { nativeMessagingHosts = [passff-host]; }) ( catppuccin-sddm.override { flavor = "mocha"; diff --git a/config/home.nix b/config/home.nix index f263d31..9eea3af 100644 --- a/config/home.nix +++ b/config/home.nix @@ -49,164 +49,105 @@ home.packages = with pkgs; [ # System - unstable.ffcast - unstable.rofi-screenshot - rofi-bluetooth - rofi-pulse-select - rofi-vpn - rofi-emoji - rofi-power-menu - yarn - pastel - plantuml - geos - inotify-tools - procps - arion - wget - alsa-utils - killall - upower - gcc - gnumake - htop - openssh xsel unzip zip - imagemagick - ghostscript - killall + wget + alsa-utils + upower + gcc + gnumake cmake - feh - brightnessctl - scrot - dunst - xbanish - networkmanager + arion + htop pavucontrol + procps + openssh + networkmanager fd bat appimage-run bluez bluez-tools - grc - xorg.xmodmap - playerctl - openssl - libiconv - pkg-config - libsecret - go - ghorg - libsixel - valgrind - nicotine-plus - resonance - - #Terminal - meli - tuifeed - jq - gnuplot - qrencode - texliveFull - filezilla - - python311Packages.urwid - python311Packages.numpy - python311Packages.matplotlib - sysz betterlockscreen - gh - git - tmux - zathura + tmux yt-dlp fzf - ripgrep - alsa-lib - libdbusmenu - xorg.libxcb - speedcrunch eza btop - poppler_utils - pandoc - glow - rustup - openssl - pkg-config + xcolor + + # Dev + yarn + plantuml + go + jq + qrencode + git lazydocker - termusic - - #Unfree - obsidian - discord - slack - spotify - - #Alternatives - # slack-cli - # discordo - - #Desktop - libreoffice-qt6-fresh - fluent-reader - aerc - firefox - vial - thunderbird - kitty - alacritty - unstable.neovim - fastfetch - lazygit - pdfarranger - byzanz - drawio - xdotool - pinentry - remmina - - #Dev air templ - python3 - python311Packages.pip ranger - python311Packages.pynvim - ueberzugpp - jdk - maven + tesseract4 #LSP nil jdt-language-server - python311Packages.python-lsp-server + texlab marksman - clojure-lsp - omnisharp-roslyn - haskell-language-server - java-language-server nodePackages_latest.bash-language-server - dockerfile-language-server-nodejs - yaml-language-server - ansible-language-server lua-language-server tree-sitter - nodejs_22 - nodePackages_latest.vls - nodePackages_latest.volar - vscode-langservers-extracted gopls + # Geography + geos + + # UI + rofi-bluetooth + pastel + imagemagick + #VPN openvpn networkmanagerapplet networkmanager-l2tp strongswan - ansible + + # Display + scrot + xbanish + feh + brightnessctl + dunst + + # Documentas + ripgrep + grc + texliveFull + pandoc + poppler_utils + + #Desktop + pinta + zathura + firefox + vial + thunderbird + alacritty + unstable.neovim + fastfetch + lazygit + byzanz + remmina + + # Utils + speedcrunch + termusic + + #Unfree + discord + slack ]; programs.home-manager.enable = true; programs.fish.enable = true; diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix index 76150a2..7a02fbf 100644 --- a/maskiner/laptop/configuration.nix +++ b/maskiner/laptop/configuration.nix @@ -37,29 +37,7 @@ AllowUsers fw ''; }; - syncthing = { - enable = true; - user = "fw"; - dataDir = "/home/fw/syncthing"; - configDir = "/home/fw/.config/syncthing"; - overrideDevices = true; # overrides any devices added or deleted through the WebUI - overrideFolders = true; # overrides any folders added or deleted through the WebUI - guiAddress = "0.0.0.0:8384"; - settings = { - devices = { - "desktop" = { id = "BGEQVAA-JZM7DQB-7NFEDQ6-K7Q3HQL-P6OSNJ2-TMA3N7B-E6RP3HQ-OAMWJQL"; }; - "jobb" = { id = "XRKVC74-UNJDQSW-4G3RHC3-5I4W5UT-D2MRMBZ-R4A4MMT-4XB4W47-LFLFBAV"; }; - }; - folders = { - "Documents" = { # Name of folder in Syncthing, also the folder ID - path = "/home/fw/docs"; # Which folder to add to Syncthing - devices = [ "desktop" ]; # Which devices to share the folder with - }; - }; - }; - }; }; - # services.spotifyd.settings.password = config.sops.secrets."spotify_password".path; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "23.11"; } diff --git a/shared/dwm.nix b/shared/dwm.nix index 0e8305f..320d8e2 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -3,7 +3,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "696050185fa48575e53157e83d46ae0613733446"; + rev = "c02e50e47966263f2d18a4442570ba6e38d76a4b"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev diff --git a/shared/fish.nix b/shared/fish.nix index 48e1eee..28e9d08 100644 --- a/shared/fish.nix +++ b/shared/fish.nix @@ -48,8 +48,7 @@ home="home-manager switch --flake $HM_DIR"; reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR"; cam="jira issue create && jira issue assign && jira issue move"; - vpnup="sudo VPN_PROTOCOL=wireguard DISABLE_IPV6=yes DIP_TOKEN=no AUTOCONNECT=true PIA_PF=false PIA_DNS=true PIA_USER=p4558499 PIA_PASS=vUZA6Nfzci ~/program/manual-connections/run_setup.sh"; - vpndown="wg-quick down pia"; + latest="git log | head -1 | awk '{print $2;}' | xsel -i"; }; interactiveShellInit = '' set fish_greeting # Disable greeting diff --git a/shared/vim.nix b/shared/vim.nix index bd1aaa3..54be076 100644 --- a/shared/vim.nix +++ b/shared/vim.nix @@ -3,35 +3,24 @@ programs.vim = { enable = true; plugins = with pkgs.vimPlugins; [ - ale vim-nix vim-lastplace - dracula-vim vim-sensible vim-commentary + vim-surround vim-fugitive + auto-pairs fzf-vim - YouCompleteMe - asyncomplete-vim - asyncomplete-lsp-vim - ultisnips - vim-snippets - vim-lsp - vim-lsp-snippets - vim-lsp-ultisnips - vim-lsp-settings - asyncomplete-lsp-vim + catppuccin-vim ]; settings = { ignorecase = true; }; extraConfig = '' nnoremap f :Files nnoremap w :w nnoremap q :q + nnoremap o :RG nnoremap :bnext nnoremap :bprev - inoremap pumvisible() ? "\" : "\" - inoremap pumvisible() ? "\" : "\" - inoremap pumvisible() ? asyncomplete#close_popup() : "\" set cmdheight=1 set relativenumber @@ -39,44 +28,8 @@ set shiftwidth=4 set tabstop=4 set termguicolors - colorscheme dracula - - function! s:on_lsp_buffer_enabled() abort - setlocal omnifunc=lsp#complete - setlocal signcolumn=yes - if exists('+tagfunc') | setlocal tagfunc=lsp#tagfunc | endif - nmap gd (lsp-definition) - nmap gs (lsp-document-symbol-search) - nmap gS (lsp-workspace-symbol-search) - nmap gr (lsp-references) - nmap gi (lsp-implementation) - nmap gt (lsp-type-definition) - nmap rn (lsp-rename) - nmap [g (lsp-previous-diagnostic) - nmap ]g (lsp-next-diagnostic) - nmap K (lsp-hover) - nnoremap lsp#scroll(+4) - nnoremap lsp#scroll(-4) - - let g:lsp_format_sync_timeout = 1000 - autocmd! BufWritePre *.rs,*.go call execute('LspDocumentFormatSync') - - " refer to doc to add more commands - endfunction - - augroup lsp_install - au! - " call s:on_lsp_buffer_enabled only for languages that has the server registered. - autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() - augroup END - if executable('nil') - autocmd User lsp_setup call lsp#register_server({ - \ 'name': 'nil', - \ 'cmd': {server_info->['nil']}, - \ 'whitelist': ['nix'], - \ }) - endif + colorscheme catppuccin_mocha ''; }; }