Update to 22.05

switch vscode package to vscode-fhs
Add some packages
2022-06-02 16:39:12 +02:00 · 2022-06-02 16:35:34 +02:00 · 2022-06-02 16:34:09 +02:00 · 2022-06-02 16:33:21 +02:00 · 2022-04-18 05:50:32 +02:00
13 changed files with 371 additions and 423 deletions
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "dotfiles": {
      "flake": false,
      "locked": {
-        "lastModified": 1646666700,
-        "narHash": "sha256-RYIWLAgxtVEwtHAETeQDzF84Sk2mWtyzLlli0MvWNG4=",
+        "lastModified": 1654179945,
+        "narHash": "sha256-vnD7vu/hRBPoqL6Wse9CELitW30a9P++QTPnNm1qHjE=",
        "owner": "h7x4abk3g",
        "repo": "dotfiles",
-        "rev": "678c83b1908fe37f8a3a9f2c8a3a91adb7a6c5aa",
+        "rev": "37bdd48de4bfa8e03a8ab5ef840b2509e193e6a1",
        "type": "github"
      },
      "original": {
@ -34,7 +34,8 @@
    "fonts": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-bkloNC5QJvk/7u6YaPFzQ7uZJzO280lFZZ09iRvQUtY=",
+        "lastModified": 1651945262,
+        "narHash": "sha256-7r0hq5G/HjK6yVOt18VKaxuJcGM6GPu/jmwbkksJ7LE=",
        "path": "/home/h7x4/git/fonts",
        "type": "path"
      },
@ -50,32 +51,32 @@
        ]
      },
      "locked": {
-        "lastModified": 1647175256,
-        "narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
+        "lastModified": 1654113405,
+        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
+        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "release-22.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1648203577,
-        "narHash": "sha256-CbXZkiVTA0ByV/yncFHCAGIa/AfcSb0cjqzEa56rO+Y=",
+        "lastModified": 1654005557,
+        "narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d89f18a17e51532ed5f4d45297b0ddf11e46b9c8",
+        "rev": "08950a6e29cf7bddee466592eb790a417550f7f9",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
        "type": "indirect"
      }
    },
@ -96,11 +97,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1648431323,
-        "narHash": "sha256-QfEh/IY3RodDhwt9ij4gzdU4cgQ/Ejk45PZMM1sNkoM=",
+        "lastModified": 1649608490,
+        "narHash": "sha256-tVzuIvLtLybKWvQU4DwCq1B1tS7OyJIHaIUT8pc/rOI=",
        "ref": "main",
-        "rev": "d9728ee32a078ca67af897d951db007391857daa",
-        "revCount": 21,
+        "rev": "02206a27ecd80602a23d42ac01059bd1a335e172",
+        "revCount": 23,
        "type": "git",
        "url": "file:///home/h7x4/git/nix-secrets"
      },
--- a/flake.nix
+++ b/flake.nix
@ -2,10 +2,10 @@
  description = "Mmmmmh, Spaghetti™";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-21.11";
+    nixpkgs.url = "nixpkgs/nixos-22.05";

    home-manager = {
-      url = "github:nix-community/home-manager/release-21.11";
+      url = "github:nix-community/home-manager/release-22.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@ -97,7 +97,7 @@
        };
        username = "h7x4";
        homeDirectory = "/home/h7x4";
-        stateVersion = "21.11";
+        stateVersion = "22.05";
        configuration = {

          imports = [
--- a/home.nix
+++ b/home.nix
@ -57,6 +57,12 @@ in {
        sys.ps2='\x01\x1b[1;49;31m\x02...\x01\x1b[0m\x02 '  # bright red
      '';
    };
+
+    pointerCursor = mkIf graphics  {
+      package = pkgs.capitaine-cursors;
+      name = "capitaine-cursors";
+      size = 16;
+    };
  };

  news.display = "silent";
@ -111,14 +117,6 @@ in {

  xdg.enable = true;

-  xsession = mkIf graphics {
-    pointerCursor = {
-      package = pkgs.capitaine-cursors;
-      name = "capitaine-cursors";
-      size = 16;
-    };
-  };
-
  gtk = mkIf graphics {
    enable = true;
    font = {
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -1,26 +1,75 @@
 { pkgs, config, inputs, specialArgs, ... }:
 let
  inherit (pkgs) lib;
+  inherit (specialArgs) machineVars;
 in {
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
+
+
+  nix = {
+    package = pkgs.nixFlakes;
+    distributedBuilds = machineVars.hostname != "Tsuki";
+    binaryCaches = [
+      "https://cache.nixos.org/"
+    ];
+
+    extraOptions = ''
+      experimental-features = nix-command flakes
+	    builders-use-substitutes = true
+    '';
+
+    trustedUsers = [ "h7x4" ];
+
+    buildMachines = [
+      {
+        hostName = "Tsuki";
+        system = "x86_64-linux";
+        maxJobs = 1;
+        speedFactor = 3;
+        supportedFeatures = [
+          "nixos-test"
+          "benchmark"
+          "big-paralell"
+          "kvm"
+        ];
+        mandatoryFeatures = [];
+      }
+    ];
+    # registry = {
+
+    # };
+  };
+
  time.timeZone = "Europe/Oslo";

-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # nixpkgs.config = {
-  #   allowUnfree = true;
-  # };
-
  console = {
    font = "Lat2-Terminus16";
    keyMap = "us";
  };

-  nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-	    builders-use-substitutes = true
-    '';
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    inputMethod = lib.mkIf (!machineVars.headless) {
+      enabled = "fcitx";
+      fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
+    };
+
+    # inputMethod = {
+    #   enabled = "fcitx5";
+    #   fcitx5.addons = with pkgs; [
+    #     fcitx5-mozc
+    #     fcitx5-gtk
+    #   ];
+    # };
+  };
+
+  networking = {
+    nameservers = [
+      "1.1.1.1"
+      "8.8.8.8"
+    ];
  };

  environment = {
@ -35,6 +84,12 @@ in {
      dash
    ];

+    systemPackages = with pkgs; [
+      wget 
+    ] ++ (lib.optionals (!machineVars.headless) [
+      haskellPackages.xmobar
+    ]);
+
    etc = {
      # TODO: move this out of etc, and reference it directly in sudo config.
      sudoLecture = {
@ -80,8 +135,10 @@ in {
      liberation_ttf
      migmix
      noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
      noto-fonts-emoji
+      ocr-a
      open-sans
      source-han-sans
      source-sans
@ -101,9 +158,26 @@ in {
    };
  };

-  users.users.h7x4 = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
+  users = {
+    users.h7x4 = {
+      isNormalUser = true;
+      shell = pkgs.zsh;
+
+      extraGroups = [
+        "wheel"
+        "networkmanager"
+        "docker"
+        "disk"
+        "audio"
+        "video"
+        "libvirtd"
+        "input"
+      ];
+    };
+
+    groups = {
+      adbusers.members = [ "h7x4" ];
+    };
  };

  home-manager = {
@ -117,10 +191,103 @@ in {
    };
  };

+  services = {
+    tumbler.enable = !machineVars.headless;
+    gnome.gnome-keyring.enable = !machineVars.headless;
+
+    openssh = {
+      # enable = true;
+      passwordAuthentication = false;
+      kbdInteractiveAuthentication = false;
+      permitRootLogin = "no";
+    };
+
+    dbus = {
+      enable = !machineVars.headless;
+      packages = with pkgs; [
+        gcr
+        dconf
+      ];
+    };
+
+    xserver = {
+      enable = !machineVars.headless;
+      layout = "us";
+      xkbOptions = "caps:escape";
+
+      libinput = {
+        enable = true;
+        touchpad.disableWhileTyping = true;
+      };
+
+      desktopManager = {
+        xterm.enable = false;
+        xfce.enable = true;
+      };
+
+      windowManager.xmonad = {
+        enable = true;
+        enableContribAndExtras = true;
+      };
+
+      displayManager.defaultSession = "none+xmonad";
+    };
+
+  };
+
+  programs = {
+    dconf.enable = !machineVars.headless;
+    git.enable = true;
+    light.enable = !machineVars.headless;
+    npm.enable = true;
+    tmux.enable = true;
+
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      configure = {
+        packages.myVimPackage = with pkgs.vimPlugins; {
+          start = [
+            direnv-vim
+            vim-nix
+            vim-polyglot
+          ];
+
+          opt = [
+            vim-monokai
+          ];
+        };
+
+        customRC = ''
+          set number relativenumber
+          set undofile
+          set undodir=~/.cache/vim/undodir
+
+          packadd! vim-monokai
+          colorscheme monokai
+        '';
+      };
+    };
+  };
+
+  sound = {
+    enable = !machineVars.headless;
+    mediaKeys.enable = true;
+  };
+
+  hardware.pulseaudio.enable = !machineVars.headless;
+
  security.sudo.extraConfig = ''
    Defaults    lecture = always
    Defaults    lecture_file = /etc/${config.environment.etc.sudoLecture.target}
  '';
 
-  system.stateVersion = "21.11";
+  system.stateVersion = "22.05";
 }
--- a/hosts/eisei/configuration.nix
+++ b/hosts/eisei/configuration.nix
@ -42,145 +42,17 @@ in {
    # };
  };

-  i18n = {
-    inputMethod = {
-      enabled = "fcitx";
-      fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
-    };
-
-    # inputMethod = {
-    #   enabled = "fcitx5";
-    #   fcitx5.addons = with pkgs; [
-    #     fcitx5-mozc
-    #     fcitx5-gtk
-    #   ];
-    # };
-  };
-
  services = {
    openssh.enable = true;
-    gnome.gnome-keyring.enable = true;
    printing.enable = true;
-    dbus = {
-      enable = true;
-      packages = with pkgs; [
-        gcr
-        gnome3.dconf
-      ];
-    };
    cron = {
      enable = true;
      systemCronJobs = [
    #     "*/5 * * * *      root    date >> /tmp/cron.log"
      ];
    };
-
-    xserver = {
-      enable = true;
-      layout = "us";
-      xkbOptions = "caps:escape";
-
-      libinput = {
-        enable = true;
-        touchpad.disableWhileTyping = true;
-      };
-
-      windowManager.xmonad = {
-        enable = true;
-        enableContribAndExtras = true;
-      };
-    };
  };

-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
-  hardware.bluetooth.enable = true;
-
-  nix = {
-    distributedBuilds = true;
-    binaryCaches = [
-      "https://cache.nixos.org/"
-    ];
-
-    buildMachines = [
-      {
-        hostName = "Tsuki";
-        system = "x86_64-linux";
-        maxJobs = 1;
-        speedFactor = 3;
-        supportedFeatures = [
-          "nixos-test"
-          "benchmark"
-          "big-paralell"
-          "kvm"
-        ];
-        mandatoryFeatures = [];
-      }
-    ];
-
-  };
-
-  users.users.h7x4.extraGroups = [
-    "wheel"
-    "networkmanager"
-    "docker"
-    "disk"
-    "audio"
-    "video"
-    "libvirtd"
-    "input"
-  ];
-
-  environment.systemPackages = with pkgs; [
-    wget
-    haskellPackages.xmobar
-  ];
-
-  programs = {
-    dconf.enable = true;
-    git.enable = true;
-    light.enable = true;
-    npm.enable = true;
-    tmux.enable = true;
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-      configure = {
-        packages.myVimPackage = with pkgs.vimPlugins; {
-          start = [
-            direnv-vim
-            vim-nix
-            vim-polyglot
-          ];
-
-          opt = [
-            vim-monokai
-          ];
-        };
-
-        customRC = ''
-          set number relativenumber
-          set undofile
-          set undodir=~/.cache/vim/undodir
-
-          packadd! vim-monokai
-          colorscheme monokai
-        '';
-      };
-    };
-
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-  };
-
-  virtualisation = {
-    docker.enable = true;
-    libvirtd.enable = true;
-  };
+  hardware.bluetooth.enable = false;
 }

--- a/hosts/kasei/configuration.nix
+++ b/hosts/kasei/configuration.nix
@ -39,124 +39,21 @@
    firewall.enable=true;
  };

-  i18n = {
-    inputMethod = {
-      enabled = "fcitx";
-      fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
-    };
-
-    # inputMethod = {
-    #   enabled = "fcitx5";
-    #   fcitx5.addons = with pkgs; [
-    #     fcitx5-mozc
-    #     fcitx5-gtk
-    #   ];
-    # };
-  };
-
-  users.users.h7x4.extraGroups = [
-    "wheel"
-    "networkmanager"
-    "docker"
-    "audio"
-    "video"
-    "disk"
-    "libvirtd"
-    "input"
-  ];
-
  environment = {
    shellAliases = {
      fixscreen = "xrandr --output DP-4 --mode 1920x1080 --pos 0x0 -r 144 --output DVI-D-1 --primary --mode 1920x1080 --pos 1920x0 -r 60";
    };
-
-    systemPackages = with pkgs; [
-      wget
-      haskellPackages.xmobar
-    ];
  };

  services = {
-    openssh = {
-      enable = true;
-      passwordAuthentication = false;
-      challengeResponseAuthentication = false;
-      permitRootLogin = "no";
-    };
-    gnome.gnome-keyring.enable = true;
+    openssh.enable = true;
    printing.enable = true;
-    dbus = {
-      enable = true;
-      packages = with pkgs; [
-        gcr
-        gnome3.dconf
-      ];
-    };
    cron = {
      enable = true;
      systemCronJobs = [
    #     "*/5 * * * *      root    date >> /tmp/cron.log"
      ];
    };
-
-    xserver = {
-      enable = true;
-      layout = "us";
-      xkbOptions = "caps:escape";
-
-      displayManager.lightdm.enable = true;
-
-      libinput = {
-        enable = true;
-        touchpad.disableWhileTyping = true;
-      };
-
-      windowManager.xmonad = {
-        enable = true;
-        enableContribAndExtras = true;
-      };
-    };
-  };
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
-  hardware.bluetooth.enable = true;
-
-  programs = {
-    dconf.enable = true;
-    git.enable = true;
-    light.enable = true;
-    npm.enable = true;
-    tmux.enable = true;
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-      configure = {
-        packages.myVimPackage = with pkgs.vimPlugins; {
-          start = [
-            direnv-vim
-            vim-nix
-            vim-polyglot
-          ];
-
-          opt = [
-            vim-monokai
-          ];
-        };
-
-        customRC = ''
-          set number relativenumber
-          set undofile
-          set undodir=~/.cache/vim/undodir
-
-          packadd! vim-monokai
-          colorscheme monokai
-        '';
-      };
-    };
  };

  virtualisation = {
--- a/hosts/tsuki/configuration.nix
+++ b/hosts/tsuki/configuration.nix
@ -51,20 +51,11 @@
    networkmanager.enable = true;
    useDHCP = false;
    interfaces.ens18.useDHCP = true;
-    nameservers = [
-      "1.1.1.1"
-      "8.8.8.8"
-    ];
    firewall.enable=true;
  };

  services = {
-    openssh = {
-      enable = true;
-      passwordAuthentication = false;
-      challengeResponseAuthentication = false;
-      permitRootLogin = "no";
-    };
+    openssh.enable = true;
    printing.enable = true;
    cron = {
      enable = true;
@ -74,61 +65,14 @@
    };
  };

-  users.groups.media = {};
-
-  users.users = {
-    h7x4.extraGroups = [
-      "wheel"
-      "networkmanager"
-      "docker"
-      "disk"
-      "libvirtd"
-      "input"
-    ];
-    media = {
+  users = {
+    groups.media = {};
+    users.media = {
      isSystemUser = true;
      group = "media";
    };
  };

-  environment.systemPackages = with pkgs; [
-    wget
-  ];
-
-  programs = {
-    git.enable = true;
-    npm.enable = true;
-    tmux.enable = true;
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-      configure = {
-        packages.myVimPackage = with pkgs.vimPlugins; {
-          start = [
-            direnv-vim
-            vim-nix
-            vim-polyglot
-          ];
-
-          opt = [
-            vim-monokai
-          ];
-        };
-
-        customRC = ''
-          set number relativenumber
-          set undofile
-          set undodir=~/.cache/vim/undodir 
-
-          packadd! vim-monokai 
-          colorscheme monokai
-        '';
-      };
-    };
-  };
-
  virtualisation = {
    docker.enable = true;
    libvirtd.enable = true;
--- a/hosts/tsuki/services/matrix.nix
+++ b/hosts/tsuki/services/matrix.nix
@ -20,7 +20,7 @@
    listeners = [
      {
        port = secrets.ports.matrix.listener;
-        bind_address = "::1";
+        bind_addresses = [ "::1" ];
        type = "http";
        tls = false;
        x_forwarded = true;
--- a/packages.nix
+++ b/packages.nix
@ -7,6 +7,7 @@
    python39Packages.bpython
    broot
    castnow
+    catdocx
    cheat
    cli-visualizer
    cloc
@ -38,6 +39,7 @@
    keymapviz
    lastpass-cli
    lazydocker
+    libwebp
    lolcat
    manix
    mcfly
@ -61,6 +63,7 @@
    nmap
    ouch
    pandoc
+    parallel
    python3
    rclone
    ripgrep
@ -98,6 +101,7 @@
    lib.optionals (!machineVars.headless) [
      ahoviewer
      anki
+      ark
      audacity
      calibre
      cool-retro-term
@ -107,6 +111,7 @@
      element-desktop
      fcitx
      geogebra
+      gimp
      gnome.gnome-font-viewer
      google-chrome
      inkscape
@ -126,6 +131,7 @@
      mopidy-youtube
      mpc_cli
      nyxt
+      obsidian
      pulseaudio
      pulsemixer
      scrcpy
@ -141,11 +147,15 @@
      xcalib
      xclip
      xdotool
-      xfce.thunar
-      xfce.thunar-archive-plugin
-      xfce.thunar-dropbox-plugin
-      xfce.thunar-media-tags-plugin
-      xfce.thunar-volman
+      (xfce.thunar.override {
+        thunarPlugins = with xfce; [
+          thunar-volman
+          thunar-dropbox-plugin
+          thunar-archive-plugin
+          thunar-media-tags-plugin
+        ];
+      })
+
      # xsnow # Wait until christmas
      yuzu-mainline
      zeal
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -1,5 +1,17 @@
 { pkgs ? import <nixpkgs> {} }: let
  call = pkg: { name = pkg; value = pkgs.callPackage ./${pkg} {}; };
 in builtins.listToAttrs (map call [
-  # TODO: Add some packages
+  "gitmirror"
+  # "koneko"
+  # "listen-moe"
+  # "bb"
 ])
+
+# {
+#   koneko = pkgs.callPackage ./koneko {};
+#   listen-moe = pkgs.callPackage ./listen-moe {};
+#   simplicity-studio = pkgs.callPackage ./simplicity-studio-5 {};
+#   # deezloader-remix = pkgs.callPackage ./pkgs/deezloader-remix {};
+#   ani-cli = pkgs.callPackage ./ani-cli {};
+#   bb = pkgs.callPackage ./bb {};
+# }
--- a/pkgs/gitmirror/default.nix
+++ b/pkgs/gitmirror/default.nix
@ -0,0 +1,22 @@
+{ buildGoModule, fetchFromGitHub }:
+buildGoModule {
+  pname = "gitmirror";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "dustin";
+    repo = "gitmirror";
+    rev = "9daaa97";
+    sha256 = "2smiuFMrGEiKQapFJe7a1Fhs4mTPJ6jlQG6NHIqPZSM=";
+  };
+
+  vendorSha256 = "x9SK+CstG9pic9qkkdgrd+OvGax93X1N+oC/PKQ6Abs=";
+
+  meta = {
+    description = "A web server to receive webhooks and mirror git repos.";
+    homepage = "https://github.com/dustin/gitmirror";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+  };
+}
+
--- a/pluggables/tools/programming.nix
+++ b/pluggables/tools/programming.nix
@ -1,5 +1,8 @@
 { pkgs, ... }:
 {
+
+  programs.adb.enable = true;
+
  system.extraDependencies = with pkgs; [
    asciidoc
    asciidoctor
@ -16,7 +19,7 @@
    gcc
    ghc
    ghcid
-    haskellPackages.Cabal_3_6_2_0
+    haskellPackages.Cabal_3_6_3_0
    maven
    nixfmt
    nixpkgs-fmt
@ -36,6 +39,8 @@
    sqlint
    sqlite
    sqlite-web
+    xmlformat
+    xmlstarlet
  ];
 }

--- a/programs/vscode.nix
+++ b/programs/vscode.nix
@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:

 let mapPrefixToSet = prefix: set:
    with lib; attrsets.mapAttrs' (k: v: attrsets.nameValuePair ("${prefix}.${k}") v) set;
@ -11,7 +11,46 @@ in
    enable = true;

    # package = pkgs.vscodium;
-    # package = pkgs.vscode-fhsWithPackages (ps: with ps; [rustup zlib]);
+    package = pkgs.vscode-fhsWithPackages (ps: with ps; [
+      # rustup
+      # zlib
+      asciidoc
+      asciidoctor
+      cabal2nix
+      clang
+      dart
+      dotnet-sdk
+      dotnet-sdk_3
+      dotnet-sdk_5
+      dotnetPackages.Nuget
+      elm2nix
+      elmPackages.elm
+      flutter
+      gcc
+      ghc
+      ghcid
+      haskellPackages.Cabal_3_6_3_0
+      maven
+      nixfmt
+      nixpkgs-fmt
+      # nixpkgs-hammering
+      nodePackages.node2nix
+      nodePackages.npm
+      nodePackages.sass
+      nodePackages.typescript
+      nodePackages.yarn
+      nodejs
+      plantuml
+      python3
+      rustc
+      rustup
+      sqlcheck
+      sqlint
+      sqlite
+      sqlite-web
+      xmlformat
+      xmlstarlet
+    ]);
    # package = pkgs.vscode-fhs;

    userSettings = let
@ -93,17 +132,17 @@ in

      java = mapPrefixToSet "java" {
        "configuration.checkProjectSettingsExclusions" = false;
-        "test.report.showAfterExecution" = "always";
-        "test.report.position" = "currentView";
+        # "test.report.showAfterExecution" = "always";
+        # "test.report.position" = "currentView";
        "refactor.renameFromFileExplorer" = "preview";
      };

-      sync = mapPrefixToSet "sync" {
-        autoUpload = true;
-        autoDownload = true;
-        quietSync = true;
-        gist = "86e19852a95d31a278ad1a516b40556b";
-      };
+      # sync = mapPrefixToSet "sync" {
+      #   autoUpload = true;
+      #   autoDownload = true;
+      #   quietSync = true;
+      #   gist = "86e19852a95d31a278ad1a516b40556b";
+      # };

      svg = mapPrefixToSet "svgviewer" {
        transparencygrid = true;
@ -113,7 +152,7 @@ in
      };

      indentRainbow = mapPrefixToSet "indentRainbow" {
-        errorColor = "rgb(255, 0, 0)";
+        errorColor= "rgb(255, 0, 0)";
        colors = [ # http://colrd.com/palette/38436/
          "rgba(26, 19, 52, 0.1)"
          "rgba(1, 84, 90, 0.1)"
@ -143,7 +182,7 @@ in
    java //
    python //
    svg //
-    sync //
+    # sync //
    workbench //
    vim // # This needs to come after workbench because of setting ordering
    zen //
@ -183,8 +222,8 @@ in
      ];
      "docker.showStartPage" = false;

-      "errorLens.errorColor" = "rgba(240,0,0,0.1)";
-      "errorLens.warningColor" = "rgba(180,180,0,0.1)";
+      "errorLens.errorBackground" = "rgba(240,0,0,0.1)";
+      "errorLens.warningBackground" = "rgba(180,180,0,0.1)";

      "jupyter.askForKernelRestart" = false;

@ -205,17 +244,17 @@ in

      "redhat.telemetry.enabled" = false;

-      "sonarlint.rules" = {
-        "java:S3358" = {
-          "level" = "off";
-        };
-      };
+      # "sonarlint.rules" = {
+      #   "java:S3358" = {
+      #     "level" = "off";
+      #   };
+      # };

      # Language overrides

      "dart.previewFlutterUiGuides" = true;
      "dart.previewFlutterUiGuidesCustomTracking" = true;
-      "dart.previewLsp" = true;
+      # "dart.previewLsp" = true;

      "[dart]" = {
        "editor.defaultFormatter" = "Dart-Code.dart-code";
@ -223,7 +262,7 @@ in

      "[html]" = {
        "editor.formatOnSave" = false;
-        "editor.defaultFormatter" = "lonefy.vscode-JS-CSS-HTML-formatter";
+        "editor.defaultFormatter" = "vscode.html-language-features";
      };

      "[javascript]" = {
@ -233,6 +272,7 @@ in

      "[json]" = {
        "editor.formatOnSave" = true;
+        "editor.defaultFormatter" = "vscode.json-language-features";
      };

      "[jsonc]" = {
@ -303,36 +343,40 @@ in
    ];

    extensions = with pkgs.vscode-extensions; [
-      vs-liveshare
-      # ms-vsliveshare.vsliveshare
-      redhat.java
-      wholroyd.jinja
-      bbenoist.nix
-      # jock.svg
-      vscodevim.vim
-      haskell.haskell
-      justusadam.language-haskell
-      naumovs.color-highlight
-      # eamodio.gitlens
-      ms-python.python
-      mikestead.dotenv
-      redhat.vscode-yaml
-      # ms-toolsai.jupyter
-      # dotjoshjohnson.xml
-      usernamehw.errorlens
-      ibm.output-colorizer
-      gruntfuggly.todo-tree
-      mechatroner.rainbow-csv
-      ms-python.vscode-pylance
-      james-yu.latex-workshop
-      elmtooling.elm-ls-vscode
      # WakaTime.vscode-wakatime
-      yzhang.markdown-all-in-one
-      pkief.material-icon-theme
-      # ms-vscode-remote.remote-ssh
+      # dotjoshjohnson.xml
+      # eamodio.gitlens
+      # jock.svg
      # ms-azuretools.vscode-docker
-      justusadam.language-haskell
+      # ms-toolsai.jupyter
+      # ms-vscode-remote.remote-ssh
+      # ms-vsliveshare.vsliveshare
+      asciidoctor.asciidoctor-vscode
+      bbenoist.nix
      coenraads.bracket-pair-colorizer-2
+      dotjoshjohnson.xml
+      elmtooling.elm-ls-vscode
+      gruntfuggly.todo-tree
+      haskell.haskell
+      ibm.output-colorizer
+      james-yu.latex-workshop
+      justusadam.language-haskell
+      justusadam.language-haskell
+      mechatroner.rainbow-csv
+      mhutchie.git-graph
+      mikestead.dotenv
+      ms-python.python
+      ms-python.vscode-pylance
+      naumovs.color-highlight
+      pkief.material-icon-theme
+      redhat.java
+      redhat.vscode-yaml
+      shardulm94.trailing-spaces
+      usernamehw.errorlens
+      vs-liveshare
+      vscodevim.vim
+      wholroyd.jinja
+      yzhang.markdown-all-in-one
    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
      {
        name = "path-intellisense";
@ -340,24 +384,12 @@ in
        version = "2.4.2";
        sha256 = "1a4d1n4jpdlx4r2majirnhnwlj34jc94wzbxdrih615176hadxvc";
      }
-      {
-        name = "xml";
-        publisher = "DotJoshJohnson";
-        version = "2.5.1";
-        sha256 = "1v4x6yhzny1f8f4jzm4g7vqmqg5bqchyx4n25mkgvw2xp6yls037";
-      }
      {
        name = "vscode-html-css";
        publisher = "ecmel";
        version = "1.10.2";
        sha256 = "0qzh7fwgadcahxx8hz1sbfz9lzi81iv4xiidvfm3sahyl9s6pyg1";
      }
-      {
-        name = "elm-ls-vscode";
-        publisher = "elmTooling";
-        version = "2.3.0";
-        sha256 = "1nxl3im5aqiggjx0va64bpjrwshb6fzxan78fqzs68iwn16vsa0b";
-      }
      {
        name = "vscode-drawio";
        publisher = "hediet";
@ -412,12 +444,6 @@ in
        version = "1.1.29";
        sha256 = "1x3k8pmzp186bcgga3wg6y86waxrcsi5cnwaxfmifqgn87jp2vqq";
      }
-      {
-        name = "trailing-spaces";
-        publisher = "shardulm94";
-        version = "0.3.1";
-        sha256 = "0h30zmg5rq7cv7kjdr5yzqkkc1bs20d72yz9rjqag32gwf46s8b8";
-      }
      {
        name = "comment-divider";
        publisher = "stackbreak";
@ -430,12 +456,6 @@ in
        version = "1.3.0";
        sha256 = "03jas413ivahfpxrlc5qif35nd67m1nmwx8p8dj1fpv04s6fdigb";
      }
-      {
-        name = "asciidoctor-vscode";
-        publisher = "asciidoctor";
-        version = "2.8.10";
-        sha256 = "1n293nsaid9c4lsfn5ns4899yay9vckfk7ld3l2cnd29s82d316i";
-      }
      {
        name = "vscode-svgviewer";
        publisher = "cssho";
@ -496,12 +516,6 @@ in
        version = "0.2.3";
        sha256 = "06vivclp58wzmqcx6s6pl8ndqina7p995dr59aj9fk65xihkaagy";
      }
-      {
-        name = "git-graph";
-        publisher = "mhutchie";
-        version = "1.30.0";
-        sha256 = "000zhgzijf3h6abhv4p3cz99ykj6489wfn81j0s691prr8q9lxxh";
-      }
      {
        name = "test-adapter-converter";
        publisher = "ms-vscode";
@ -580,6 +594,12 @@ in
        version = "3.4.0";
        sha256 = "0ihfrsg2sc8d441a2lkc453zbw1jcpadmmkbkaf42x9b9cipd5qb";
      }
+      {
+        name = "keyboard-quickfix";
+        publisher = "pascalsenn";
+        version = "0.0.6";
+        sha256 = "BK7ND6gtRVEitxaokJHmQ5rvSOgssVz+s9dktGQnY6M=";
+      }
    ];
  };
 }
Author	SHA1	Message	Date
Oystein Kristoffer Tveit	5b217af62f	Update to 22.05	2022-06-02 16:39:12 +02:00
Oystein Kristoffer Tveit	662ca4cc43	switch vscode package to vscode-fhs	2022-06-02 16:35:34 +02:00
Oystein Kristoffer Tveit	14f461830c	Add some packages	2022-06-02 16:34:09 +02:00
Oystein Kristoffer Tveit	da95fb2e96	Pull out more host settings to common	2022-06-02 16:33:21 +02:00
Oystein Kristoffer Tveit	f49bd969d2	Add gitmirror to pkgs	2022-04-18 05:50:32 +02:00