diff --git a/flake.lock b/flake.lock index fbeae507..419b7cae 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1686307493, - "narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=", + "lastModified": 1688307440, + "narHash": "sha256-7PTjbN+/+b799YN7Tk2SS5Vh8A0L3gBo8hmB7Y0VXug=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f", + "rev": "b06bab83bdf285ea0ae3c8e145a081eb95959047", "type": "github" }, "original": { @@ -47,8 +47,8 @@ "inputs": { "devshell": "devshell_3", "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1686513235, @@ -75,11 +75,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1685948350, - "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=", + "lastModified": 1686747123, + "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac", + "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", "type": "github" }, "original": { @@ -112,21 +112,18 @@ }, "devshell_2": { "inputs": { - "flake-utils": [ - "keycloak-theme-pub-solar", - "flake-utils" - ], "nixpkgs": [ "keycloak-theme-pub-solar", "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "lastModified": 1688380630, + "narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=", "owner": "numtide", "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205", "type": "github" }, "original": { @@ -142,7 +139,7 @@ "deno2nix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1685972731, @@ -164,7 +161,7 @@ "scan2paperless", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1685972731, @@ -337,12 +334,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -353,25 +353,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -387,9 +369,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1685518550, @@ -412,11 +394,11 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1687871164, + "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", "type": "github" }, "original": { @@ -435,11 +417,11 @@ ] }, "locked": { - "lastModified": 1669645736, - "narHash": "sha256-u1yK1fyh1UEX3BITfk6ROenWbP3aznZRplwCE+FVtHE=", + "lastModified": 1689875310, + "narHash": "sha256-gJxh8fVX24nZXBxstZcrzZhMRFG9jyOnQEfkgoRr39I=", "ref": "main", - "rev": "b488fe24a27bf76e0b777202bf13a68660121305", - "revCount": 17, + "rev": "c2c86bbf9855f16a231a596b75b443232a7b9395", + "revCount": 24, "type": "git", "url": "https://git.pub.solar/pub-solar/keycloak-theme" }, @@ -451,11 +433,11 @@ }, "latest": { "locked": { - "lastModified": 1689534811, - "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", "type": "github" }, "original": { @@ -467,11 +449,11 @@ }, "master": { "locked": { - "lastModified": 1686515714, - "narHash": "sha256-hU35B9xqwEoaZUPHsHwEtW//3BOwhdFf4O9L2s/1dIo=", + "lastModified": 1690187165, + "narHash": "sha256-BNOJqUECJNfYpRWY+vAwFoUD4yiKIJFu8RRjnlS6t2E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e785ef3e3ee07295a586657bfa552dd3f6cdda3", + "rev": "1de5c5027b2bd0c3ef698e5e5cf929bc53228639", "type": "github" }, "original": { @@ -481,28 +463,13 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1685840432, - "narHash": "sha256-VJIbiKsY7Xy4E4WcgwUt/UiwYDmN5BAk8tngAjcWsqY=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "961e99baaaa57f5f7042fe7ce089a88786c839f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixos": { "locked": { - "lastModified": 1686331006, - "narHash": "sha256-hElRDWUNG655aqF0awu+h5cmDN+I/dQcChRt2tGuGGU=", + "lastModified": 1689680872, + "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85bcb95aa83be667e562e781e9d186c57a07d757", + "rev": "08700de174bc6235043cb4263b643b721d936bdb", "type": "github" }, "original": { @@ -512,32 +479,13 @@ "type": "github" } }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1685943944, - "narHash": "sha256-GpaQwOkvwkmSWxvWaZqbMKyyOSaBAwgdEcHCqLW/240=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "122dcc32cadf14c5015aa021fae8882c5058263a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1686452266, - "narHash": "sha256-zLKiX0iu6jZFeZDpR1gE6fNyMr8eiM8GLnj9SoUCjFs=", + "lastModified": 1686838567, + "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2a807ad6e8dc458db08588b78cc3c0f0ec4ff321", + "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", "type": "github" }, "original": { @@ -548,16 +496,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685894048, - "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=", - "owner": "NixOS", + "lastModified": 1686412476, + "narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6", + "rev": "21951114383770f96ae528d0ae68824557768e81", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -594,46 +542,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1686412476, - "narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "21951114383770f96ae528d0ae68824557768e81", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nvfetcher": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixos" - ] - }, - "locked": { - "lastModified": 1687440270, - "narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=", - "owner": "berberman", - "repo": "nvfetcher", - "rev": "44196458acc2c28c32e456c50277d6148e71e708", - "type": "github" - }, - "original": { - "owner": "berberman", - "repo": "nvfetcher", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -648,9 +556,7 @@ "latest": "latest", "master": "master", "nixos": "nixos", - "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nvfetcher": "nvfetcher", "scan2paperless": "scan2paperless" } }, @@ -658,8 +564,8 @@ "inputs": { "deno2nix": "deno2nix", "devshell": "devshell_4", - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1686513257, @@ -750,6 +656,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index fe71b9cb..27583b6f 100644 --- a/flake.nix +++ b/flake.nix @@ -35,12 +35,6 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; - nvfetcher.url = "github:berberman/nvfetcher"; - nvfetcher.inputs.nixpkgs.follows = "nixos"; - nvfetcher.inputs.flake-compat.follows = "flake-compat"; - - nixos-generators.url = "github:nix-community/nixos-generators"; - keycloak-theme-pub-solar.url = "git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main"; keycloak-theme-pub-solar.inputs.nixpkgs.follows = "nixos"; @@ -58,7 +52,6 @@ nixos-hardware, agenix, deploy, - nvfetcher, scan2paperless, ... } @ inputs: @@ -97,7 +90,6 @@ }); }) agenix.overlays.default - nvfetcher.overlays.default (import ./pkgs) ]; diff --git a/modules/graphical/network-manager-applet.service.nix b/modules/graphical/network-manager-applet.service.nix index 4252c065..a3214651 100644 --- a/modules/graphical/network-manager-applet.service.nix +++ b/modules/graphical/network-manager-applet.service.nix @@ -1,6 +1,6 @@ pkgs: { Unit = { - Description = "Lightweight Wayland notification daemon"; + Description = "Network Manager applet"; BindsTo = ["sway-session.target"]; After = ["sway-session.target"]; # ConditionEnvironment requires systemd v247 to work correctly diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix index e69e365a..87e2ae09 100644 --- a/modules/terminal-life/nvim/default.nix +++ b/modules/terminal-life/nvim/default.nix @@ -48,55 +48,66 @@ in { [] ++ lib.optionals (!cfg.lite) [ (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ - p.nix - p.markdown + p.ini p.json p.json5 + p.markdown + p.nix + p.toml p.yaml - p.html p.css - p.scss - p.typescript - p.tsx - p.javascript p.graphql + p.html + p.javascript + p.scss + p.tsx + p.typescript p.vue - p.rust + p.c + p.cpp p.go p.gomod p.gosum - p.ruby - p.python p.haskell - p.c - p.cpp + p.lua + p.php + p.python + p.ruby + p.rust p.vim p.vimdoc - p.sql p.passwd + p.sql + p.diff p.gitcommit p.gitignore p.git_config p.gitattributes p.git_rebase + p.bash p.dockerfile + p.make + p.ninja p.terraform ])) + # Dependencies for nvim-lspconfig nvim-cmp cmp-nvim-lsp cmp_luasnip luasnip + # Quickstart configs for neovim LSP lsp_extensions-nvim nvim-lspconfig + # Collaborative editing in Neovim using built-in capabilities instant-nvim-nvfetcher # Search functionality behind :Ack @@ -111,36 +122,55 @@ in { # File browser. Use n to access nnn-vim + # Highlight characters when using f, F, t, and T quick-scope + + # Get sudo in vim; :SudaWrite suda-vim - vim-gutentags + + # Undo history etc. per project vim-workspace-nvfetcher + # JSON schemas + SchemaStore-nvim + + # Work with tags files + vim-gutentags + + # Neovim colorschemes / themes sonokai vim-hybrid-material vim-airline-themes vim-apprentice-nvfetcher + # Git integrations + # A Git wrapper so awesome, it should be illegal fugitive + # Shows git diff markers in the sign column vim-gitgutter + # GitHub extension for fugitive vim-rhubarb + # Ease your git workflow within Vim vimagit-nvfetcher + # FZF fuzzy finder fzf-vim fzfWrapper + # Make the yanked region apparent vim-highlightedyank + # :Beautify Code beautifier vim-beautify-nvfetcher - vim-surround + # Unload, delete or wipe a buffer without closing the window vim-bufkill + # Defaults everyone can agree on vim-sensible + # emmet for vim: http://emmet.io/ emmet-vim + # Caddyfile syntax support for Vim vim-caddyfile-nvfetcher - - # JSON schema files for e.g. package.json lsp - SchemaStore-nvim ]; extraConfig = builtins.concatStringsSep "\n" [ diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 43529c08..e20e2de2 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -5,6 +5,7 @@ channels: final: prev: { (channels.latest) nixd + nvfetcher ; inherit diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 4a9c9654..eaf5b466 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -3,17 +3,17 @@ { blesh-nvfetcher = { pname = "blesh-nvfetcher"; - version = "1afc616b890e487926897e5b3e3a33e0ad833cb3"; + version = "4089c4e1cb411121472180189953664b978d8972"; src = fetchFromGitHub { owner = "akinomyoga"; repo = "ble.sh"; - rev = "1afc616b890e487926897e5b3e3a33e0ad833cb3"; + rev = "4089c4e1cb411121472180189953664b978d8972"; fetchSubmodules = true; deepClone = false; leaveDotGit = true; - sha256 = "sha256-gDxx7nDleS2HWIJWc208gcTzuRUEu/JCyepTuOJDAGo="; + sha256 = "sha256-ZLkiBm3vsRe42crLffM9Z8F5yzKvNRV2/AqK9RkuU+8="; }; - date = "2023-06-29"; + date = "2023-07-18"; }; instant-nvim-nvfetcher = { pname = "instant-nvim-nvfetcher"; diff --git a/profiles/base-user/.config/git/gitmessage.nix b/profiles/base-user/.config/git/gitmessage.nix index b3caf55a..223bfc3e 100644 --- a/profiles/base-user/.config/git/gitmessage.nix +++ b/profiles/base-user/.config/git/gitmessage.nix @@ -6,27 +6,27 @@ user = config.pub-solar.user; xdg = config.home-manager.users."${user.name}".xdg; in '' - # What happened? - # - # fix feat build chore ci docs style refactor perf test - # - # type!(optional scope): - # +# What happened? +# +# fix feat build chore ci docs style refactor perf test +# +# type!(optional scope): --------------# +# - # ^\n - # What exactly was done and why? - # +# ^\n +# What exactly was done and why? --------------------------------------# +# - # ^\n - # - # Any issue numbers or links? - # - # Refs: #123 +# ^\n +# +# Any issue numbers or links? +# +# Ref: #123 - # ^\n - # - # Co-authored-by: Example Name +# ^\n +# +# Co-authored-by: Example Name ''