From eb9cd9d8cf136b8f7c04734f0e39975019d81377 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 2 Dec 2023 15:48:36 +0100 Subject: [PATCH] updgrade to 23.11 --- flake.lock | 16 +- flake.nix | 4 +- home/home/default.nix | 1 - home/home/pkgs.nix | 1 + home/modules/default.nix | 1 - home/modules/module-list.nix | 1 - home/modules/vim/default.nix | 45 ---- home/modules/vim/vimrc | 157 ------------- home/modules/xdg.nix | 1 - nixos/agares/network.nix | 1 + nixos/modules/admin.nix | 2 +- nixos/modules/default.nix | 1 - nixos/modules/profiles/laptop.nix | 2 +- nixos/modules/soft-serve.nix | 212 ------------------ nixos/ninurta/configuration.nix | 1 + nixos/surgat/configuration.nix | 2 + overlays.nix | 8 - pkgs/default.nix | 4 +- pkgs/map.nix | 32 --- pkgs/soft-serve.nix | 37 --- pkgs/vimPlugins/default.nix | 34 --- pkgs/vimPlugins/filetype/ftplugin/bash.vim | 3 - pkgs/vimPlugins/filetype/ftplugin/cpp.vim | 11 - pkgs/vimPlugins/filetype/ftplugin/css.vim | 3 - pkgs/vimPlugins/filetype/ftplugin/fish.vim | 2 - pkgs/vimPlugins/filetype/ftplugin/foo.kt | 3 - pkgs/vimPlugins/filetype/ftplugin/go.vim | 3 - pkgs/vimPlugins/filetype/ftplugin/html.vim | 3 - .../filetype/ftplugin/javascript.vim | 5 - pkgs/vimPlugins/filetype/ftplugin/kotlin.vim | 5 - pkgs/vimPlugins/filetype/ftplugin/ledger.vim | 3 - pkgs/vimPlugins/filetype/ftplugin/markdown.md | 2 - pkgs/vimPlugins/filetype/ftplugin/nix.vim | 5 - pkgs/vimPlugins/filetype/ftplugin/perl.vim | 3 - pkgs/vimPlugins/filetype/ftplugin/python.vim | 4 - pkgs/vimPlugins/filetype/ftplugin/rust.vim | 2 - pkgs/vimPlugins/filetype/ftplugin/scss.vim | 3 - pkgs/vimPlugins/filetype/ftplugin/tex.vim | 7 - .../filetype/ftplugin/typescript.vim | 5 - pkgs/vimPlugins/filetype/ftplugin/yaml.vim | 4 - 40 files changed, 18 insertions(+), 621 deletions(-) delete mode 100644 home/modules/vim/default.nix delete mode 100644 home/modules/vim/vimrc delete mode 100644 nixos/modules/soft-serve.nix delete mode 100644 pkgs/map.nix delete mode 100644 pkgs/soft-serve.nix delete mode 100644 pkgs/vimPlugins/default.nix delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/bash.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/cpp.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/css.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/fish.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/foo.kt delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/go.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/html.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/javascript.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/kotlin.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/ledger.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/markdown.md delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/nix.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/perl.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/python.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/rust.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/scss.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/tex.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/typescript.vim delete mode 100644 pkgs/vimPlugins/filetype/ftplugin/yaml.vim diff --git a/flake.lock b/flake.lock index ea02367..e2ec65c 100644 --- a/flake.lock +++ b/flake.lock @@ -239,16 +239,16 @@ ] }, "locked": { - "lastModified": 1699748081, - "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "04bac349d585c9df38d78e0285b780a140dc74a4", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -369,16 +369,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699596684, - "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "lastModified": 1701389149, + "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 48892c5..ee4b473 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,13 @@ description = "dadada's nix flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; flake-utils = { url = "github:numtide/flake-utils"; inputs.systems.follows = "systems"; }; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/home/home/default.nix b/home/home/default.nix index 6b2a28f..27902db 100644 --- a/home/home/default.nix +++ b/home/home/default.nix @@ -6,7 +6,6 @@ let useFeatures = [ "alacritty" #"emacs" - "vim" "direnv" "git" "gpg" diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index f42e138..910ceb1 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -89,6 +89,7 @@ with pkgs; [ nmap nmon nodePackages.prettier + map-cmd obs-studio offlineimap openscad diff --git a/home/modules/default.nix b/home/modules/default.nix index 9d0427c..093c10b 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -16,7 +16,6 @@ syncthing = import ./syncthing.nix; termite = import ./termite.nix; tmux = import ./tmux.nix; - vim = import ./vim; xdg = import ./xdg.nix; zsh = import ./zsh.nix; } diff --git a/home/modules/module-list.nix b/home/modules/module-list.nix index bffa457..bbe6b3f 100644 --- a/home/modules/module-list.nix +++ b/home/modules/module-list.nix @@ -14,7 +14,6 @@ ./syncthing.nix ./termite.nix ./tmux.nix - ./vim ./xdg.nix ./zsh.nix ] diff --git a/home/modules/vim/default.nix b/home/modules/vim/default.nix deleted file mode 100644 index fa7e60f..0000000 --- a/home/modules/vim/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: -with lib; let - cfg = config.dadada.home.vim; - vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { }; -in -{ - options.dadada.home.vim = { - enable = mkEnableOption "Enable VIM config"; - }; - - config = mkIf cfg.enable { - programs.vim = { - enable = true; - extraConfig = builtins.readFile ./vimrc; - plugins = [ - pkgs.vimPlugins.vim-nix - #pkgs.vimPlugins.kotlin-vim - pkgs.vimPlugins.ale - pkgs.vimPlugins.fzf-vim - pkgs.vimPlugins.rust-vim - pkgs.vimPlugins.base16-vim - pkgs.vimPlugins.typescript-vim - pkgs.vimPlugins.vim-airline - pkgs.vimPlugins.vim-airline-themes - pkgs.vimPlugins.vim-fish - pkgs.vimPlugins.vim-gitgutter - vimPlugins.vim-buftabline - vimPlugins.spacemacsTheme - vimPlugins.filetype - pkgs.vimPlugins.vim-ledger - ]; - }; - home.packages = with pkgs; [ - languagetool - nixpkgs-fmt - shellcheck - perlPackages.PerlCritic - texlab - ]; - }; -} diff --git a/home/modules/vim/vimrc b/home/modules/vim/vimrc deleted file mode 100644 index dc74c3b..0000000 --- a/home/modules/vim/vimrc +++ /dev/null @@ -1,157 +0,0 @@ -filetype plugin on -filetype indent on - -set autoread -" :W sudo saves the file -" (useful for handling the permission-denied error) -command W w !sudo tee % > /dev/null - -" no command execution from modeline -set nomodeline - -" Turn on the Wild menu -set wildmenu - -" Enable hidden buffers -set hidden - -" Clipboard copy & paste -set clipboard=unnamedplus - -" Always show current position -set ruler - -" When searching try to be smart about cases -set smartcase - -" Highlight search results -set hlsearch - -" Inenteremental search -set incsearch - -" Don't redraw while executing macros (good performance config) -set lazyredraw - -" Do not show matching brackets when text indicator is over them -" set noshowmatch -" let loaded_matchparen = 1 - -" No annoying sound on errors -set noerrorbells -set novisualbell - -set wrap -set linebreak -set nolist " list disables linebreak - -set mouse=a - -" Enable syntax highlighting -syntax enable - -if (has("termguicolors")) - let &t_8f="\[38;2;%lu;%lu;%lum" - let &t_8b="\[48;2;%lu;%lu;%lum" - set termguicolors -endif - -set t_Co=256 - -set background=dark -colorscheme spacemacs-theme - -set tabstop=4 -set softtabstop=4 -set softtabstop=4 -set expandtab -set smarttab -set smartindent -set autoindent -set copyindent -set preserveindent - -set wildmode=longest,list,full -set wildmenu - -set cursorline -set number -set relativenumber - -" Transparency -"hi Normal guibg=NONE ctermbg=NONE - -"set list! -"set listchars=trail:⛤,extends:⟩,precedes:⟨,nbsp:␣,conceal:… - -" Map leader to do extra key combinations -let mapleader = " " - -" Toggle paste mode on and off -map pp :setlocal paste! - -" Fast saving -nmap w :w - -" Buffer switching -nmap bl :Buffers -nmap bd :bdelete -nmap bn :bnext -nmap bp :bprevious - -" List things -nmap hl :History/ -nmap ll :Lines -nmap ml :Marks -nmap rl :reg -nmap wl :Windows - -" finding files -nmap ff :Files - -set statusline+=%#warningmsg# -set statusline+=%{SyntasticStatuslineFlag()} -set statusline+=%* - -"let g:syntastic_always_populate_loc_list = 1 -"let g:syntastic_auto_loc_list = 1 -"let g:syntastic_check_on_open = 1 -"let g:syntastic_check_on_wq = 0 -nmap fr :ALEFindReferences -nmap gd :ALEGoToDefinition -nmap hh :ALEHover -nmap ss :ALESymbolSearch -nmap rn :ALERename -nmap rf :ALERefactor -nmap ca :ALE -nmap fx :ALEFix - -" Enable completion where available. -" This setting must be set before ALE is loaded. -let g:ale_completion_enabled = 1 -let g:ale_fix_on_save = 0 -let g:ale_warn_about_trailing_whitespace = 1 -let g:ale_warn_about_trailing_lines = 1 -let g:ale_completion_autoimport = 1 -let g:ale_languagetool_executable = 'languagetool-commandline' -let g:ale_set_quickfix = 1 - -"let g:ale_lint_on_text_changed = 'never' -" You can disable this option too -" if you don't want linters to run on opening a file -"let g:ale_lint_on_enter = 0 - -" Set airline theme -let g:airline_theme='base16_spacemacs' - -" Load all plugins now. -" Plugins need to be added to runtimepath before helptags can be generated. -packloadall -" Load all of the helptags now, after plugins have been loaded. -" All messages and errors will be ignored. -silent! helptags ALL - -set omnifunc=ale#completion#OmniFunc -" -" autocmd BufWritePost RunBuf make -command! -nargs=1 RunBuf execute ':let job = job_start("", {"out_io": "buffer", "out_name": ""})' diff --git a/home/modules/xdg.nix b/home/modules/xdg.nix index a034c87..e9f0c0d 100644 --- a/home/modules/xdg.nix +++ b/home/modules/xdg.nix @@ -18,7 +18,6 @@ with lib; let "application/xhtml+xml" = "firefox.desktop"; "application/x-extension-xhtml" = "firefox.desktop"; "application/x-extension-xht" = "firefox.desktop"; - "text/plain" = "vim.desktop"; "application/pdf" = "org.pwmt.zathura.desktop"; }; cfg = config.dadada.home.xdg; diff --git a/nixos/agares/network.nix b/nixos/agares/network.nix index 37ad724..cd6640f 100644 --- a/nixos/agares/network.nix +++ b/nixos/agares/network.nix @@ -5,6 +5,7 @@ let domain = "bs.dadada.li"; in { + networking.useDHCP = false; systemd.network = { enable = true; links = { diff --git a/nixos/modules/admin.nix b/nixos/modules/admin.nix index 8a6818e..873832d 100644 --- a/nixos/modules/admin.nix +++ b/nixos/modules/admin.nix @@ -96,7 +96,7 @@ in users.mutableUsers = mkDefault false; environment.systemPackages = with pkgs; [ - vim + helix tmux ]; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 6d8f98b..c2b27dc 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -14,7 +14,6 @@ packages = import ./packages.nix; secrets = import ./secrets.nix; share = import ./share.nix; - soft-serve = import ./soft-serve.nix; steam = import ./steam.nix; sway = import ./sway.nix; vpnServer = import ./vpnServer.nix; diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index ff68072..551cfc2 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -20,7 +20,7 @@ with lib; { age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - fonts.fonts = mkDefault (with pkgs; [ + fonts.packages = mkDefault (with pkgs; [ source-code-pro ]); diff --git a/nixos/modules/soft-serve.nix b/nixos/modules/soft-serve.nix deleted file mode 100644 index a2e1a27..0000000 --- a/nixos/modules/soft-serve.nix +++ /dev/null @@ -1,212 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - cfg = config.services.soft-serve; - configFile = format.generate "config.yaml" cfg.settings; - exe = getExe cfg.package; - format = pkgs.formats.yaml { }; - user = "soft-serve"; -in -{ - options = { - services.soft-serve = { - enable = mkEnableOption "Enable soft-serve service"; - - package = mkPackageOption pkgs "soft-serve" { }; - - stateDir = mkOption { - type = types.path; - default = "/var/lib/soft-serve"; - description = lib.mdDoc '' - The absolute path to the data directory. - - See . - ''; - }; - - user = mkOption { - type = types.str; - default = user; - description = lib.mdDoc "User account under which soft-serve runs."; - }; - - group = mkOption { - type = types.str; - default = user; - description = lib.mdDoc "Group account under which soft-serve runs."; - }; - - settings = mkOption { - type = format.type; - default = { }; - description = lib.mdDoc '' - The contents of the configuration file. - - See . - ''; - example = literalExpression '' - { - # Soft Serve Server configurations - - # The name of the server. - # This is the name that will be displayed in the UI. - name = "Soft Serve"; - - # Log format to use. Valid values are "json", "logfmt", and "text". - log_format = "text"; - - # The SSH server configuration. - ssh = { - # The address on which the SSH server will listen. - listen_addr = ":23231"; - - # The public URL of the SSH server. - # This is the address that will be used to clone repositories. - public_url = "ssh://localhost:23231"; - - # The path to the SSH server's private key. - key_path = "ssh/soft_serve_host"; - - # The path to the SSH server's client private key. - # This key will be used to authenticate the server to make git requests to - # ssh remotes. - client_key_path = "ssh/soft_serve_client"; - - # The maximum number of seconds a connection can take. - # A value of 0 means no timeout. - max_timeout = 0; - - # The number of seconds a connection can be idle before it is closed. - idle_timeout = 120; - }; - # The Git daemon configuration. - git = { - # The address on which the Git daemon will listen. - listen_addr = ":9418"; - - # The maximum number of seconds a connection can take. - # A value of 0 means no timeout. - max_timeout = 0; - - # The number of seconds a connection can be idle before it is closed. - idle_timeout = 3; - - # The maximum number of concurrent connections. - max_connections = 32; - }; - - # The HTTP server configuration. - http = { - # The address on which the HTTP server will listen. - listen_addr = ":23232"; - - # The path to the TLS private key. - tls_key_path = ""; - - # The path to the TLS certificate. - tls_cert_path = ""; - - # The public URL of the HTTP server. - # This is the address that will be used to clone repositories. - # Make sure to use https:// if you are using TLS. - public_url = "http://localhost:23232"; - - }; - - # The stats server configuration. - stats = { - # The address on which the stats server will listen. - listen_addr = ":23233"; - }; - # Additional admin keys. - initial_admin_keys = [ - "ssh-rsa AAAAB3NzaC1yc2..." - ]; - }; - ''; - }; - }; - }; - - config = let stateDir = cfg.stateDir; in mkIf cfg.enable { - users.users = mkIf (cfg.user == "soft-serve") { - soft-serve = { - description = "soft-serve service"; - home = cfg.stateDir; - useDefaultShell = true; - group = cfg.group; - isSystemUser = true; - }; - }; - - users.groups = mkIf (cfg.group == "soft-serve") { - soft-serve = { }; - }; - - systemd.tmpfiles.rules = [ - "d '${stateDir}' 0750 ${cfg.user} ${cfg.group} - -" - ]; - - systemd.services.soft-serve = { - description = "Soft Serve git server 🍦"; - documentation = [ "https://github.com/charmbracelet/soft-serve" ]; - requires = [ "network-online.target" ]; - after = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - - environment = { - SOFT_SERVE_DATA_PATH = stateDir; - }; - - preStart = '' - # Link the settings file into the data directory. - ln -fs ${configFile} ${stateDir}/config.yaml - ''; - - serviceConfig = { - Type = "simple"; - User = cfg.user; - Group = cfg.group; - Restart = "always"; - RestartSec = "1"; - ExecStart = "${exe} serve"; - WorkingDirectory = stateDir; - RuntimeDirectory = "soft-serve"; - RuntimeDirectoryMode = "0750"; - ProcSubset = "pid"; - ProtectProc = "invisible"; - ReadWritePaths = [ stateDir ]; - UMask = "0027"; - CapabilityBoundingSet = ""; - NoNewPrivileges = true; - ProtectSystem = "strict"; - ProtectHome = true; - PrivateTmp = true; - PrivateDevices = true; - PrivateUsers = true; - ProtectHostname = true; - ProtectClock = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectKernelLogs = true; - ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; - RestrictNamespaces = true; - LockPersonality = true; - MemoryDenyWriteExecute = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - RemoveIPC = true; - PrivateMounts = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@cpu-emulation @debug @keyring @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap" - ]; - }; - }; - }; - - meta.maintainers = [ maintainers.dadada ]; -} diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix index 5512b1f..3b0ef2d 100644 --- a/nixos/ninurta/configuration.nix +++ b/nixos/ninurta/configuration.nix @@ -378,6 +378,7 @@ in services.resolved.enable = true; networking.networkmanager.enable = false; + networking.useDHCP = false; # Desktop things for media playback diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix index ee79fd5..ee710da 100644 --- a/nixos/surgat/configuration.nix +++ b/nixos/surgat/configuration.nix @@ -60,6 +60,8 @@ in location = "/var/backup/postgresql"; }; + networking.useDHCP = false; + systemd.network = { enable = true; networks = { diff --git a/overlays.nix b/overlays.nix index 636893e..6d636ec 100644 --- a/overlays.nix +++ b/overlays.nix @@ -38,12 +38,4 @@ }; }); }; - - soft-serve = final: prev: { - soft-serve = prev.callPackage ./pkgs/soft-serve.nix { }; - }; - - map = final: prev: { - map = prev.callPackage ./pkgs/map.nix { }; - }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index a9983e9..c78fe50 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,2 @@ { pkgs }: -{ - map = pkgs.callPackage ./map.nix { }; -} +{ } diff --git a/pkgs/map.nix b/pkgs/map.nix deleted file mode 100644 index 8cb9a39..0000000 --- a/pkgs/map.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "map"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "soveran"; - repo = pname; - rev = "0.1.1"; - sha256 = "sha256-yGzmhZwv1qKy0JNcSzqL996APQO8OGWQ1GBkEkKTOXA="; - }; - - makefile = "makefile"; - - installPhase = '' - export PREFIX="$out"; - mkdir -p "$out" - make install - ''; - - checkPhase = '' - make test - ''; - - meta = with lib; { - description = "Map lines from stdin to commands"; - license = licenses.bsd2; - homepage = "https://github.com/soveran/map"; - platforms = platforms.all; - maintainers = with maintainers; [ dadada ]; - }; -} diff --git a/pkgs/soft-serve.nix b/pkgs/soft-serve.nix deleted file mode 100644 index 0a397dc..0000000 --- a/pkgs/soft-serve.nix +++ /dev/null @@ -1,37 +0,0 @@ -# Borrowed from nixpkgs. -# See https://github.com/NixOS/nixpkgs/issues/86349 -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, git, bash }: - -buildGoModule rec { - pname = "soft-serve"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "charmbracelet"; - repo = "soft-serve"; - rev = "v${version}"; - sha256 = "sha256-PY/BHfuDRHXpzyUawzZhDr1m0c1tWqawW7GP9muhYAs="; - }; - - vendorHash = "sha256-jtEiikjEOThTSrd+UIEInxQmt2z5YVyksuTC17VmdkA="; - - doCheck = false; - - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/soft \ - --prefix PATH : "${lib.makeBinPath [ git bash ]}" - ''; - - meta = with lib; { - description = "A tasty, self-hosted Git server for the command line"; - homepage = "https://github.com/charmbracelet/soft-serve"; - changelog = "https://github.com/charmbracelet/soft-serve/releases/tag/v${version}"; - mainProgram = "soft"; - license = licenses.mit; - maintainers = with maintainers; [ penguwin ]; - }; -} diff --git a/pkgs/vimPlugins/default.nix b/pkgs/vimPlugins/default.nix deleted file mode 100644 index c513c33..0000000 --- a/pkgs/vimPlugins/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs -, lib -, fetchFromGitHub -, ... -}: -with lib; { - filetype = pkgs.vimUtils.buildVimPluginFrom2Nix { - pname = "dadadaVimFiletype"; - version = "0.2"; - src = ./filetype; - }; - - spacemacsTheme = pkgs.vimUtils.buildVimPluginFrom2Nix { - pname = "spacemacs-theme"; - version = "2.0.1"; - src = pkgs.fetchFromGitHub { - owner = "colepeters"; - repo = "spacemacs-theme.vim"; - rev = "056bba9bd05a2c97c63c28216a1c232cfb91529e"; - sha256 = "0iy3i6waigk759p2z59mrxkjc0p412y7d8zf3cjak4a9sh1sh6qz"; - }; - }; - - vim-buftabline = pkgs.vimUtils.buildVimPluginFrom2Nix { - pname = "vim-buftabline"; - version = "master"; - src = pkgs.fetchFromGitHub { - owner = "ap"; - repo = "vim-buftabline"; - rev = "73b9ef5dcb6cdf6488bc88adb382f20bc3e3262a"; - sha256 = "1vs4km7fb3di02p0771x42y2bsn1hi4q6iwlbrj0imacd9affv5y"; - }; - }; -} diff --git a/pkgs/vimPlugins/filetype/ftplugin/bash.vim b/pkgs/vimPlugins/filetype/ftplugin/bash.vim deleted file mode 100644 index 51f2b56..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/bash.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/cpp.vim b/pkgs/vimPlugins/filetype/ftplugin/cpp.vim deleted file mode 100644 index 7cdc5a6..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/cpp.vim +++ /dev/null @@ -1,11 +0,0 @@ -let b:ale_fixers = ['clang-format', 'remove_trailing_lines', 'trim_whitespace'] -let b:ale_linters = ['clangd'] - -"setlocal tabstop=8 expandtab shiftwidth=2 smarttab -" GNU Coding Standards -setlocal cindent -setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1 -setlocal shiftwidth=2 -setlocal softtabstop=2 -setlocal textwidth=79 -setlocal fo-=ro fo+=cql diff --git a/pkgs/vimPlugins/filetype/ftplugin/css.vim b/pkgs/vimPlugins/filetype/ftplugin/css.vim deleted file mode 100644 index 51f2b56..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/css.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/fish.vim b/pkgs/vimPlugins/filetype/ftplugin/fish.vim deleted file mode 100644 index b1a5c53..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/fish.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Set up :make to use fish for syntax checking. -compiler fish diff --git a/pkgs/vimPlugins/filetype/ftplugin/foo.kt b/pkgs/vimPlugins/filetype/ftplugin/foo.kt deleted file mode 100644 index 892968c..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -class Foo { - fun -} diff --git a/pkgs/vimPlugins/filetype/ftplugin/go.vim b/pkgs/vimPlugins/filetype/ftplugin/go.vim deleted file mode 100644 index 13b8558..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/go.vim +++ /dev/null @@ -1,3 +0,0 @@ -set expandtab& -setlocal shiftwidth=4 -setlocal softtabstop=4 diff --git a/pkgs/vimPlugins/filetype/ftplugin/html.vim b/pkgs/vimPlugins/filetype/ftplugin/html.vim deleted file mode 100644 index 51f2b56..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/html.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/javascript.vim b/pkgs/vimPlugins/filetype/ftplugin/javascript.vim deleted file mode 100644 index 00196be..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/javascript.vim +++ /dev/null @@ -1,5 +0,0 @@ -let b:ale_fixers = ['prettier', 'eslint'] - -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/kotlin.vim b/pkgs/vimPlugins/filetype/ftplugin/kotlin.vim deleted file mode 100644 index 62f7206..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/kotlin.vim +++ /dev/null @@ -1,5 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=4 -setlocal softtabstop=4 -let g:ale_kotlin_languageserver_executable = "/home/tim/src/kotlin-language-server/server/build/install/server/bin/kotlin-language-server" - diff --git a/pkgs/vimPlugins/filetype/ftplugin/ledger.vim b/pkgs/vimPlugins/filetype/ftplugin/ledger.vim deleted file mode 100644 index 765e06c..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/ledger.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=4 -setlocal softtabstop=4 diff --git a/pkgs/vimPlugins/filetype/ftplugin/markdown.md b/pkgs/vimPlugins/filetype/ftplugin/markdown.md deleted file mode 100644 index 0c79590..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/markdown.md +++ /dev/null @@ -1,2 +0,0 @@ -let b:ale_linters = {'markdown': ['languagetool']} -let b:ale_fixers = {'markdown': ['languagetool']} diff --git a/pkgs/vimPlugins/filetype/ftplugin/nix.vim b/pkgs/vimPlugins/filetype/ftplugin/nix.vim deleted file mode 100644 index c0b88cf..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/nix.vim +++ /dev/null @@ -1,5 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 - -let b:ale_fixers = [ 'nixpkgs-fmt', 'remove_trailing_lines', 'trim_whitespace'] diff --git a/pkgs/vimPlugins/filetype/ftplugin/perl.vim b/pkgs/vimPlugins/filetype/ftplugin/perl.vim deleted file mode 100644 index 51f2b56..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/perl.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/python.vim b/pkgs/vimPlugins/filetype/ftplugin/python.vim deleted file mode 100644 index 52a8bc2..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/python.vim +++ /dev/null @@ -1,4 +0,0 @@ -" Check Python files with flake8 and pylint. -let b:ale_linters = ['flake8', 'pylint'] -" Fix Python files with autopep8 and yapf. -let b:ale_fixers = ['autopep8', 'yapf', 'add_blank_lines_for_python_control_statements', 'autopep8', 'remove_trailing_lines', 'reorder-python-imports', 'trim_whitespace'] diff --git a/pkgs/vimPlugins/filetype/ftplugin/rust.vim b/pkgs/vimPlugins/filetype/ftplugin/rust.vim deleted file mode 100644 index 3a4bd48..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/rust.vim +++ /dev/null @@ -1,2 +0,0 @@ -let b:ale_linters = {'rust': ['rustc', 'rls', 'rust-analyzer']} -let b:ale_fixers = {'rust': ['rustfmt']} diff --git a/pkgs/vimPlugins/filetype/ftplugin/scss.vim b/pkgs/vimPlugins/filetype/ftplugin/scss.vim deleted file mode 100644 index 51f2b56..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/scss.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/tex.vim b/pkgs/vimPlugins/filetype/ftplugin/tex.vim deleted file mode 100644 index 95f2bec..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/tex.vim +++ /dev/null @@ -1,7 +0,0 @@ -setlocal tabstop=2 -setlocal shiftwidth=2 -setlocal expandtab -setlocal textwidth=79 - -let b:ale_linters = {'tex': ['texlab']} -let b:ale_fixers = {'tex': ['remove_trailing_lines', 'trim_whitespace', 'texlab']} diff --git a/pkgs/vimPlugins/filetype/ftplugin/typescript.vim b/pkgs/vimPlugins/filetype/ftplugin/typescript.vim deleted file mode 100644 index 8312237..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/typescript.vim +++ /dev/null @@ -1,5 +0,0 @@ -let b:ale_fixers = ['prettier', 'eslint', 'tsserver'] - -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 diff --git a/pkgs/vimPlugins/filetype/ftplugin/yaml.vim b/pkgs/vimPlugins/filetype/ftplugin/yaml.vim deleted file mode 100644 index 51521e2..0000000 --- a/pkgs/vimPlugins/filetype/ftplugin/yaml.vim +++ /dev/null @@ -1,4 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 -setlocal softtabstop=2 -