I hate my life

configuration.nix

@@ -5,13 +5,15 @@ in
 {
   imports = [ ./modules ];
 
-  boot.loader.systemd-boot.enable = true;
   boot.tmpOnTmpfs = true;
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
 
-  services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
+  services.xserver.videoDrivers = [
+    # "displaylink"
+    "modesetting"
+  ];
 
   hardware = {
     pulseaudio = {
@@ -20,6 +22,7 @@ in
   };
 
   boot.loader = {
+    # systemd-boot.enable = true;
     efi = {
       canTouchEfiVariables = true;
       # assuming /boot is the mount point of the  EFI partition in NixOS (as the installation section recommends).
@@ -62,7 +65,7 @@ in
   };
 
 
-  system.stateVersion = "21.11";
+  system.stateVersion = "22.05";
 
   # TODO: put nixpkgs stuff inside their own file
   nixpkgs.config.allowUnfree = true;

dotfiles/neovim/README.md

@@ -1,5 +1,10 @@
 # Neovim config
 
+## Articles
+
+- [Textobjects](https://blog.carbonfive.com/vim-text-objects-the-definitive-guide/)
+- [Registers](https://www.brianstorti.com/vim-registers/)
+
 ## Keybinds
 
 Table of my own keybinds. Here as documentation for myself. I am yet to include any of the keybinds for cmp here.
@@ -8,18 +13,15 @@ Table of my own keybinds. Here as documentation for myself. I am yet to include
 > (aka all the keys need to be pressed at the same time)
 
 | Keybind      | Description                         | Plugins            |
-| ------------ | ------------------------------------------- | ------------------ |
+| ------------ | ----------------------------------- | ------------------ |
 | vv           | Create vertical split               |                    |
+| _cp_         | Use system clipboard                |                    |
 | _jl_         | Save                                |                    |
 | _jk_         | Exit insert mode                    |                    |
 | _\<leader>k_ | Insert digraph                      |                    |
 | _\<leader>a_ | Swap last 2 used buffers            |                    |
 | C-n          | Open tree                           | nvim-tree          |
 | _vp_         | Run command in another tmux pane    | vimux              |
-| _sk_         | Move to previous lh-bracket marker          | lh-brackets        |
-| _sj_         | Move to next lh-bracket marker              | lh-brackets        |
-| _mo_         | Move outside the current brackets           | lh-brackets        |
-| _ml_         | Remove all markers and move to the last one | lh-brackets        |
 | C-hjkl       | Navigation between vim & tmux panes | vim-tmux-navigator |
 | J            | Show line diagnostics               | lspconfig          |
 | K            | Show hover info                     | lspconfig          |
@@ -41,7 +43,6 @@ The default brackets I load in each buffer are (), [], "", '', {} and \`\`. Diff
 | Ctrl-P      | Find files                     |                        |
 | Ctrl-F      | Grep in project                |                        |
 | \<leader>d  | Diagnostics                    | lspconfig              |
-| \<leader>wd | Workspace diagnostics          | lspconfig              |
 | \<leader>ca | Code actions                   | lspconfig              |
 | \<leader>t  | Show builtin pickers           |                        |
 | \<leader>s  | Show symbols using tree-sitter |                        |

dotfiles/neovim/lua/my/keymaps.lua

@@ -31,6 +31,7 @@ function M.setup()
         arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
         arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
         arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
+        arpeggio.chord("nv", "cp", "\"+") -- Press cp to use the global clipboard
     end
 
     return M

dotfiles/neovim/lua/my/options.lua

@@ -12,6 +12,9 @@ function M.setup()
     opt.number = true -- Show line numbers
     opt.relativenumber = true -- Relative line numbers
 
+    -- TODO: only do this for specific filestypes
+    opt.expandtab = true -- Use spaces for the tab char
+
     opt.scrolloff = 4 -- Lines of context
     opt.shiftround = true -- Round indent
     opt.shiftwidth = 2 -- Size of an indent

dotfiles/neovim/lua/my/paq.lua

@@ -26,8 +26,8 @@ function M.setup()
         {"andweeb/presence.nvim", run = ":DownloadUnicode"}, -- discord rich presence
         "Julian/lean.nvim", -- lean support
         "kmonad/kmonad-vim", -- kmonad config support
-        "LucHermitte/lh-vim-lib", -- dependency for lh-brackets
+        -- "LucHermitte/lh-vim-lib", -- dependency for lh-brackets
-        "LucHermitte/lh-brackets", -- kinda useless bruh
+        -- "LucHermitte/lh-brackets", -- kinda useless bruh, should find something better
         -- Cmp related stuff
         "hrsh7th/cmp-nvim-lsp", -- lsp completion
         "hrsh7th/cmp-buffer", -- idr what this is

dotfiles/neovim/lua/my/plugins/init.lua

@@ -3,26 +3,26 @@ local M = {}
 function M.setup()
     -- Other unconfigured plugins
     require('nvim-autopairs').setup()
-    require("startup").setup({theme = "dashboard"})
+    require("startup").setup()
     require("presence"):setup({}) -- wtf does the : do here?
 
     -- Plugins with their own configs:
+    require("my.plugins.vim-tmux-navigator").setup()
     -- require("my.plugins.fzf-lua").setup()
     -- require("my.plugins.nerdtree").setup()
+    require("my.plugins.treesitter").setup()
     require("my.plugins.cmp").setup()
     require("my.plugins.lspconfig").setup()
     require("my.plugins.null-ls").setup()
     require("my.plugins.lualine").setup()
-    require("my.plugins.treesitter").setup()
     require("my.plugins.comment").setup()
     require("my.plugins.nvim-tree").setup()
     require("my.plugins.vimtex").setup()
     require("my.plugins.telescope").setup()
     require("my.plugins.vimux").setup()
     -- require("my.plugins.idris").setup()
+    -- require("my.plugins.lh-brackets").setup()
     require("my.plugins.lean").setup()
-    require("my.plugins.vim-tmux-navigator").setup()
-    require("my.plugins.lh-brackets").setup()
 end
 
 return M

dotfiles/neovim/lua/my/plugins/lh-brackets.lua

@@ -6,7 +6,7 @@ local M = {}
 local extraBrackets = {
     lean = {{"⟨", "⟩"}}, -- lean
     all = {
-        {"(", ")"}, {"[", "]"}, {"'", "'"}, {'"', '"'}, {"{", "}"}, {"`", "`"}
+        -- {"(", ")"}, {"[", "]"}, {"'", "'"}, {'"', '"'}, {"{", "}"}, {"`", "`"}
     } -- more general stuff
 }
 

dotfiles/neovim/lua/my/plugins/treesitter.lua

@@ -11,9 +11,6 @@ function M.setup()
         indent = {enable = true},
         highlight = {
             enable = false,
-            disable = {
-                "lua", "json", "yaml", "bash", "scss", "html", "javascript"
-            }, -- WHY TF
 
             -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
             -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).

dotfiles/neovim/lua/my/plugins/vim-tmux-navigator.lua

@@ -6,10 +6,10 @@ local M = {}
 function M.setup()
     vim.g.tmux_navigator_no_mappings = 1
 
-    map("n", "<leader>h", ":TmuxNavigateLeft<cr>")
+    map("n", "C-h", ":TmuxNavigateLeft<cr>")
-    map("n", "<leader>j", ":TmuxNavigateDown<cr>")
+    map("n", "C-j", ":TmuxNavigateDown<cr>")
-    map("n", "<leader>k", ":TmuxNavigateUp<cr>")
+    map("n", "C-k", ":TmuxNavigateUp<cr>")
-    map("n", "<leader>l", ":TmuxNavigateRight<cr>")
+    map("n", "C-l", ":TmuxNavigateRight<cr>")
 end
 
 return M

dotfiles/neovim/lua/telescope/extensions/unicode.lua

@@ -19,7 +19,18 @@ local unicodeChars = {
     arrow = "→",
     compose = "∘",
     inverse = "⁻¹",
-    dots = "…"
+    dots = "…",
+    alpha = "ɑ",
+    beta = "β",
+    pi = "π",
+    Pi = 'Π',
+    sigma = "σ",
+    Sigma = "Σ",
+    tau = "τ",
+    theta = "θ",
+    gamma = "γ",
+    Gamma = "Γ",
+    context = "Γ"
 }
 
 -- our picker function for unicode chars
@@ -52,7 +63,7 @@ function M.picker(opts)
                 local selection = action_state.get_selected_entry()
 
                 if selection == nil then
-                    utils.__warn_no_selection "builtin.planets"
+                    utils.__warn_no_selection "my.abbreviations"
                     return
                 end
 
@@ -64,7 +75,8 @@ function M.picker(opts)
     }):find()
 end
 
-function M.setupAbbreviations(ending)
+function M.setupAbbreviations(prefix, ending)
+    prefix = prefix or ""
     ending = ending or ""
 
     if not add_abbreviations then return end
@@ -73,7 +85,7 @@ function M.setupAbbreviations(ending)
 
     for key, value in pairs(unicodeChars) do
         -- By default abbreviations are triggered using "_"
-        abbreviate(key .. ending, value)
+        abbreviate(prefix .. key .. ending, value)
     end
 end
 

dotfiles/tmux/tmux.conf

@@ -7,8 +7,8 @@ bind C-a send-prefix
 set-option -g allow-rename off
 
 # Visual stuff
-set -g default-terminal "xterm-256color"
+set -g default-terminal "screen-256color"
-set-option -ga terminal-overrides ",xterm-256color:Tc"
+set-option -ga terminal-overrides ",screen-256color:Tc"
 set -g -a terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q' # Supposedly helps with cursor shapes under vim (spoiler: it does not)
 
 # Split panes with \ and -

flake.lock

@@ -275,16 +275,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1651519540,
+        "lastModified": 1654113405,
-        "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
+        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
+        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "release-22.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -571,16 +571,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653565689,
+        "lastModified": 1654605205,
-        "narHash": "sha256-xdJ6bmPxDPIMItZJWsDxopPXUTAFPWMkNkyOOcptWSc=",
+        "narHash": "sha256-aRTGBWpAr6DlLMoUyIvctWRcL59vpW98CdWUl+BhnXg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9bc0e974545d5bc4c24e1ed047be0dc4e30e494b",
+        "rev": "daa78e40e9592dbbcfd53937cbd9aae9e69a2999",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "release-21.11",
+        "ref": "release-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,12 +2,12 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
+    nixpkgs.url = "github:nixos/nixpkgs/release-22.05";
     nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-21.11";
+      url = "github:nix-community/home-manager/release-22.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

modules/applications/direnv.nix

@@ -3,6 +3,5 @@
   home-manager.users.adrielus = {
     programs.direnv.enable = true;
     programs.direnv.nix-direnv.enable = true;
-    programs.direnv.nix-direnv.enableFlakes = true;
   };
 }

modules/applications/kdeconnect.nix

@@ -3,12 +3,7 @@
     services.kdeconnect.enable = true;
   };
 
-  # Open port for kdeconfig
+  # Open port for kdeconnect
-  # networking.firewall.extraCommands = ''
-  #   iptables -A nixos-fw -p tcp --source 192.0.2.0/24 --dport 1714:1764 -j nixos-fw-accept
-  #   iptables -A nixos-fw -p udp --source 192.0.2.0/24 --dport 1714:1764 -j nixos-fw-accept
-  # '';
-
   networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
   networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
 }

modules/applications/misc.nix

@@ -48,9 +48,9 @@
     # teams
 
     # browsers
-    google-chrome
+    unstable.google-chrome
     # brave
-    # firefox
+    firefox
 
     # other stuff
     obsidian # knowedge base
@@ -75,7 +75,8 @@
     # fceux
 
     # games
-    tetrio-desktop
+    # tetrio-desktop
+    vassal
     # mindustry
     # edopro
   ];

modules/applications/neovim.nix

@@ -37,7 +37,7 @@ let
   ];
 
   myConfig = ''
-    vim.g.lualineTheme = ${theme.neovim.lualineTheme}
+    vim.g.lualineTheme = "${theme.neovim.lualineTheme}"
     vim.opt.runtimepath:append("${paths.dotfiles}/neovim")
     require("my.init").setup()
   '';
@@ -60,9 +60,9 @@ in
       home.file.".local/share/nvim/site/pack/paqs/start/paq-nvim".source = paq;
       xdg.configFile."nvim/init.lua".text = myConfig;
       xdg.configFile."nvim/lua/my/theme.lua".source = theme.neovim.theme;
+
       home.packages = [
         neovim
-        # idk why I need to install this here
       ];
 
       programs.neovim = {

modules/applications/shells/sessionVariables.nix

@@ -1,7 +1,7 @@
-{ ... }:
+{ pkgs, ... }:
 with import ../../../secrets.nix;
 let
-  theme = "github-dark";
+  theme = pkgs.myThemes.current;
   variables = {
     # Configure github cli
     GITHUB_USERNAME = "Mateiadrielrafael";
@@ -12,5 +12,9 @@ let
   };
 in
 {
+  imports = [{
+    home-manager.users.adrielus.home.sessionVariables = theme.env or { };
+  }];
+
   home-manager.users.adrielus = { home.sessionVariables = variables; };
 }

modules/dev/default.nix

@@ -12,7 +12,7 @@
     # ./elm.nix
 
     # Proof assistants
-    ./agda.nix
+    # ./agda.nix
     # ./idris.nix
     ./lean.nix
   ];

modules/dev/javascript.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  node = pkgs.nodejs-17_x;
+  node = pkgs.nodejs;
   yarn = pkgs.yarn.override { nodejs = node; };
 in
 {

modules/dev/nix.nix

@@ -2,7 +2,5 @@
   home-manager.users.adrielus.home.packages = with pkgs;
     [
       nixfmt
-      # niv
-      # cached-nix-shell
     ];
 }

modules/dev/purescript.nix

@@ -1,12 +1,12 @@
 { pkgs, ... }: {
-  home-manager.users.adrielus.home.packages = with pkgs.easy-purescript-nix; [
+  home-manager.users.adrielus.home.packages = with pkgs.unstable; [
     purescript
     spago
-    purty
+    # haskellPackages.zephyr
-    pscid
+    # purty # purescript formatter
-    pulp
+    # purs-tidy # purescript formatter
-    zephyr
+    # pscid
-    psa
+    # pulp
-    purs-tidy
+    # psa
   ];
 }

modules/overlays/legacy.nix

@@ -6,7 +6,8 @@ let
     config.allowUnfree = true;
     config.allowBroken = true;
   };
-in {
+in
+{
   nixpkgs.overlays = [
     (self: super:
       with self; rec {

modules/overlays/npm.nix

@@ -1,7 +1,12 @@
 self: super:
-let customPackages = (import ./npm) { nodejs = self.nodejs-17_x; pkgs = self; };
+
+let
+  node = self.nodejs-18_x;
+  customPackages = (import ./npm) { nodejs = node; pkgs = self; };
 in
 with self;  {
+  nodejs = node;
+
   # Faster prettier for editors
   prettierd = customPackages."@fsouza/prettierd";
 

modules/overlays/npm/default.nix

@@ -1,11 +1,8 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{ pkgs ? import <nixpkgs> {
+{pkgs ? import <nixpkgs> {
     inherit system;
-  }
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
-, system ? builtins.currentSystem
-, nodejs ? pkgs."nodejs-12_x"
-}:
 
 let
   nodeEnv = import ./node-env.nix {

modules/overlays/npm/node-packages.nix

@@ -4,22 +4,22 @@
 
 let
   sources = {
-    "core-js-3.22.5" = {
+    "core-js-3.23.1" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.22.5";
+      version = "3.23.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz";
-        sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==";
+        sha512 = "wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==";
       };
     };
-    "core_d-4.0.0" = {
+    "core_d-5.0.1" = {
       name = "core_d";
       packageName = "core_d";
-      version = "4.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core_d/-/core_d-4.0.0.tgz";
+        url = "https://registry.npmjs.org/core_d/-/core_d-5.0.1.tgz";
-        sha512 = "dBxd0Ocxj3D3K+rJxutTAZ9LQHkuMZoc9HPWYwYRYK7swou5wuIRXxgJ39YLNDvFHfHyV3JbxVYluF/AOhcRnw==";
+        sha512 = "37lZyhJY1hzgFbfU4LzY4zL09QPwPfV2W/3YBOtN7mkdvVaeP1OVnDZI6zxggtlPwG/BuE5wIr0xptlVJk5EPA==";
       };
     };
     "has-flag-4.0.0" = {
@@ -49,13 +49,13 @@ let
         sha512 = "GyQkE8M32pULhQk7Sko5raoIbPalAk90ICG+An4fq6fCsFHsP6fB2K46WGXVdoJpy4SGMnZ/EKbo123fZJomWg==";
       };
     };
-    "prettier-2.6.2" = {
+    "prettier-2.7.1" = {
       name = "prettier";
       packageName = "prettier";
-      version = "2.6.2";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz";
+        url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz";
-        sha512 = "PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==";
+        sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==";
       };
     };
     "regenerator-runtime-0.13.9" = {
@@ -85,13 +85,13 @@ let
         sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==";
       };
     };
-    "typescript-4.6.4" = {
+    "typescript-4.7.4" = {
       name = "typescript";
       packageName = "typescript";
-      version = "4.6.4";
+      version = "4.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz";
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz";
-        sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==";
+        sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==";
       };
     };
     "vscode-css-languageservice-5.4.2" = {
@@ -148,13 +148,13 @@ let
         sha512 = "BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==";
       };
     };
-    "vscode-languageserver-textdocument-1.0.4" = {
+    "vscode-languageserver-textdocument-1.0.5" = {
       name = "vscode-languageserver-textdocument";
       packageName = "vscode-languageserver-textdocument";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz";
+        url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz";
-        sha512 = "/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==";
+        sha512 = "1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==";
       };
     };
     "vscode-languageserver-types-3.17.1" = {
@@ -190,16 +190,16 @@ in
   "@fsouza/prettierd" = nodeEnv.buildNodePackage {
     name = "_at_fsouza_slash_prettierd";
     packageName = "@fsouza/prettierd";
-    version = "0.20.0";
+    version = "0.21.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@fsouza/prettierd/-/prettierd-0.20.0.tgz";
+      url = "https://registry.npmjs.org/@fsouza/prettierd/-/prettierd-0.21.1.tgz";
-      sha512 = "FQ2WX17r2RErbsheFTg6ZjdP1FTZ02Urc9uORAxc3OXPRJaVmx1AzYgTY0w3LmPZs4YyiH0IZO+BrstobhjCjA==";
+      sha512 = "xLGvk2csfCqTT3MZfXC7uGxdAy0HkMiYoVz2vCQbxNHCLSLBEoejNcbNh+MPWulRPSVBYN8jJJge6yychCU5KA==";
     };
     dependencies = [
-      sources."core_d-4.0.0"
+      sources."core_d-5.0.1"
       sources."has-flag-4.0.0"
       sources."nanolru-1.0.0"
-      sources."prettier-2.6.2"
+      sources."prettier-2.7.1"
       sources."supports-color-8.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -209,7 +209,7 @@ in
       license = "ISC";
     };
     production = true;
-    bypassCache = true;
+    bypassCache = false;
     reconstructLock = true;
   };
   vscode-langservers-extracted = nodeEnv.buildNodePackage {
@@ -221,18 +221,18 @@ in
       sha512 = "Un7gzQgvACjGtsT0Yll5QqHgL65a4mTK5ChgMnO4dgTZ3tuwJCaP84oztBqvuFZzN9QxA3C07J4QEQvf1xjcgQ==";
     };
     dependencies = [
-      sources."core-js-3.22.5"
+      sources."core-js-3.23.1"
       sources."jsonc-parser-3.0.0"
       sources."regenerator-runtime-0.13.9"
       sources."request-light-0.5.8"
-      sources."typescript-4.6.4"
+      sources."typescript-4.7.4"
       sources."vscode-css-languageservice-5.4.2"
       sources."vscode-html-languageservice-4.2.5"
       sources."vscode-json-languageservice-4.2.1"
       sources."vscode-jsonrpc-8.0.1"
       sources."vscode-languageserver-8.0.1"
       sources."vscode-languageserver-protocol-3.17.1"
-      sources."vscode-languageserver-textdocument-1.0.4"
+      sources."vscode-languageserver-textdocument-1.0.5"
       sources."vscode-languageserver-types-3.17.1"
       sources."vscode-nls-5.0.1"
       sources."vscode-uri-3.0.3"
@@ -244,7 +244,7 @@ in
       license = "MIT";
     };
     production = true;
-    bypassCache = true;
+    bypassCache = false;
     reconstructLock = true;
   };
 }

modules/themes/catppuccin/default.nix

@@ -2,12 +2,16 @@
 let
   githubTheme = pkgs.myVimPlugins.githubNvimTheme; # github theme for neovim
   foreign = pkgs.callPackage (import ./foreign.nix) { };
-  v = (a: b: if variant == "light" then a else b);
+  v = (a: b: if variant == "latte" then a else b);
 in
 {
   name = "catppuccin";
   wallpaper = wallpaper.foreign or "${foreign.wallpapers}/${wallpaper}";
 
+  env = {
+    CATPPUCCIN_FLAVOUR = variant;
+  };
+
   neovim = {
     theme = ./nvim.lua;
     lualineTheme = "catppuccin";
@@ -57,7 +61,7 @@ in
         y = 4;
       };
 
-      gtk_theme_variant = "dark";
+      gtk_theme_variant = v "light" "dark";
     };
 
     background_opacity = transparency;

modules/themes/catppuccin/nvim.lua

@@ -6,10 +6,11 @@ function M.setup()
     local catppuccin = require("catppuccin")
 
     catppuccin.setup({
-        transparent_background = true,
+        transparent_background = false,
-        integrations = {nvimtree = {transparent_panel = true}}
+        integrations = {nvimtree = {transparent_panel = false}}
     })
 
+    vim.g.catppuccin_flavour = os.getenv("CATPPUCCIN_FLAVOUR")
     vim.cmd [[colorscheme catppuccin]]
 end
 

modules/themes/themes.nix

@@ -13,7 +13,7 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [
     wallpaper = "misc/rainbow.png";
     # wallpaper.foreign = ./wallpapers/eye.png;
     transparency = 0.93;
-    variant = "light";
+    variant = "latte";
   })
   (githubVariant {
     variant = "light";