diff --git a/flake.lock b/flake.lock index cb46e86..3bb03a5 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1709836394, - "narHash": "sha256-Vm7AediRQEwyPayeAnW2SvJInfCPS+5FmlGOYGdpPrk=", + "lastModified": 1710281192, + "narHash": "sha256-jc+4BaSa3x9EZnH85HV7RqT6OsumDOapSyaFJq/hZyk=", "owner": "famedly", "repo": "conduit", - "rev": "a095e02d048e960494d13d29363e27fd92ba0ee7", + "rev": "ab98b52b21216fd849f57c9343c04d75a952fb61", "type": "gitlab" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1708939976, - "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", + "lastModified": 1710156081, + "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", "owner": "numtide", "repo": "devshell", - "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", + "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", "type": "github" }, "original": { @@ -285,11 +285,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1709965418, - "narHash": "sha256-xsKCrFDU6rU3oIqMP3IbuAGiJvsVeBTRqZvwN1p1q4c=", + "lastModified": 1710310970, + "narHash": "sha256-YREcSnbDH7Es6MDvhmzPBBF3exEg2EP4sd3QCiPyWyI=", "owner": "nix-community", "repo": "fenix", - "rev": "24002092be13b2efe87700229d143b0d1eaa5d12", + "rev": "df74cae97f59a868ad355af6a703e7845d0ae648", "type": "github" }, "original": { @@ -309,11 +309,11 @@ ] }, "locked": { - "lastModified": 1709986932, - "narHash": "sha256-43/CLFPEwQlDnhS8roLMjApwKrx663o35a9Mj/5xiXs=", + "lastModified": 1710332687, + "narHash": "sha256-mlYRkSBboiojBO0Uyqv7faOmoAlJKHXF4VBznm01nbI=", "owner": "colemickens", "repo": "flake-firefox-nightly", - "rev": "665ac1ed6179a0c8bd3303a1e103ef01d1e305c8", + "rev": "9636cc748b18a93719dd4aae1b3c0b95a8ad47be", "type": "github" }, "original": { @@ -684,11 +684,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -738,11 +738,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -817,11 +817,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709971363, - "narHash": "sha256-yhe00ntHW33OhsibFBuh/qn/UNFhxk1HQNBeM2is9Do=", + "lastModified": 1710305275, + "narHash": "sha256-E1OJZqWetL849r1MEiNxPPLDjlCtn3xiohXAwFRz1uk=", "owner": "helix-editor", "repo": "helix", - "rev": "0dc67ff8852ce99d40ad4464062ebe212b0b03a1", + "rev": "3915b04bd91084477b3076952e6ad6cfdd414e72", "type": "github" }, "original": { @@ -839,11 +839,11 @@ ] }, "locked": { - "lastModified": 1708547820, - "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", + "lastModified": 1710270110, + "narHash": "sha256-DSByMaY4UKPv7UhObH0GwJ2D0ay6CBqMWTRn4wcIb2s=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", + "rev": "3e81b3a33980f6596aafbe308abd78daea0bfa7d", "type": "github" }, "original": { @@ -905,11 +905,11 @@ ] }, "locked": { - "lastModified": 1709988192, - "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", + "lastModified": 1710349883, + "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", + "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", "type": "github" }, "original": { @@ -926,11 +926,11 @@ ] }, "locked": { - "lastModified": 1709578243, - "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=", + "lastModified": 1710281778, + "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", "owner": "nix-community", "repo": "home-manager", - "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3", + "rev": "49a266d2ca59df8a03249550e73a54626181b65d", "type": "github" }, "original": { @@ -1015,11 +1015,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710121140, - "narHash": "sha256-dBsIjSPUVlufY90U1cRcStC6vs/D58dKQKzM6XNIhsM=", + "lastModified": 1710344304, + "narHash": "sha256-jE+/UGqRYkKBBpLTTV5ayCtVmD9N1WsSKpufszUPzcA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "66330281ff19e84c986c5ce639b670929e5dadd6", + "rev": "3e67ee0f5f66c74c0a0bd4f797361fd100c2e2d2", "type": "github" }, "original": { @@ -1032,14 +1032,19 @@ "inputs": { "hyprland": [ "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1710008507, - "narHash": "sha256-XCQ0fpjSObg8sQVRg06/+eLM1t/b9XjaIvOz1OwYGwg=", + "lastModified": 1710281302, + "narHash": "sha256-Eo1Xi3WCc7rn43gxL0Fb1Wr1qjCLB0kTNr+at2a8yoA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "ba7d13e95564635d7769b979275701c6413c8da1", + "rev": "34ade54e1be45210fb7e98d41a0990472d81cefe", "type": "github" }, "original": { @@ -1142,11 +1147,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709467759, - "narHash": "sha256-ojIpNROGKk56wyvpMAlBVor3CvPez3pFMORrocxW4io=", + "lastModified": 1710184940, + "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "206e40afdc468d0658e30e1644e2473dc6285cf2", + "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf", "type": "github" }, "original": { @@ -1161,11 +1166,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1709467759, - "narHash": "sha256-ojIpNROGKk56wyvpMAlBVor3CvPez3pFMORrocxW4io=", + "lastModified": 1710184940, + "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "206e40afdc468d0658e30e1644e2473dc6285cf2", + "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf", "type": "github" }, "original": { @@ -1221,11 +1226,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1709934546, - "narHash": "sha256-S24CAQvkeivCFM6tK4D10AEyjsMgE07XVgLIkrh6Ljc=", + "lastModified": 1710284709, + "narHash": "sha256-LsUxusDVMDJiq3aQcRKw11pzxmsbUwhawIcjRxguUoA=", "owner": "neovim", "repo": "neovim", - "rev": "a69c72063994f8e9064b6d9c9f280120423897b8", + "rev": "9f59415243adcf70c02bc056ed755859456b20e8", "type": "github" }, "original": { @@ -1244,11 +1249,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1709942621, - "narHash": "sha256-8VHrHzAOR1N8VxJm4i4D1EoNHhN1gfVOUOUidxMGZZI=", + "lastModified": 1710288189, + "narHash": "sha256-9Liyaz737kE8MjLkfvc0DY5WJrNuAE0YhxIed5AZENg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "055a08233a86e7fe538db9d42fe5a92340e8de92", + "rev": "3a44d31d4d18b64f8f74c8e7439c873f3fb2f9f0", "type": "github" }, "original": { @@ -1264,11 +1269,11 @@ ] }, "locked": { - "lastModified": 1709714234, - "narHash": "sha256-fnuVQqdK48c66EC4mL8t7uLhwsY6JDyn7H5tjRpx9Sg=", + "lastModified": 1710352788, + "narHash": "sha256-gpvOzL+7PP22juK6yI01EiGUEVVo4lHGXCs5OmCAX+s=", "owner": "viperML", "repo": "nh", - "rev": "3f148b0c7f2d56be65dc55628f6b2e68ee10e231", + "rev": "393cffa098ab7aa8887134c9faa1bc98251cbfc7", "type": "github" }, "original": { @@ -1285,11 +1290,11 @@ ] }, "locked": { - "lastModified": 1709554374, - "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=", + "lastModified": 1710281379, + "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7", + "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", "type": "github" }, "original": { @@ -1432,11 +1437,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1709426687, - "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", + "lastModified": 1710031547, + "narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", + "rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6", "type": "github" }, "original": { @@ -1465,11 +1470,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1709426687, - "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", + "lastModified": 1710031547, + "narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", + "rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6", "type": "github" }, "original": { @@ -1520,11 +1525,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1709990107, - "narHash": "sha256-fuAqFR/lGwKOxMw7wCK7xzUv/JhS8v9bdNQJ9KCE5HQ=", + "lastModified": 1710357202, + "narHash": "sha256-nZTPXdHhxWS7zueB9oKKh7/l/xjzNMT1bE0LfX0kdpQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "c737af27135864461e68214f7bbe9222f7d859fb", + "rev": "1c5df30b6a855dc7c794cbe8857985af497048f8", "type": "github" }, "original": { @@ -1551,11 +1556,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -1695,11 +1700,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1709780214, - "narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=", + "lastModified": 1710252211, + "narHash": "sha256-hQChQpB4LDBaSrNlD6DPLhU9T+R6oyxMCg2V+S7Y1jg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f945939fd679284d736112d3d5410eb867f3b31c", + "rev": "7eeacecff44e05a9fd61b9e03836b66ecde8a525", "type": "github" }, "original": { @@ -1711,11 +1716,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -1738,11 +1743,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709939045, - "narHash": "sha256-cnh6ffM9DtulbQTZozM8ya1i7gjpbG7+n8udSTaYzrM=", + "lastModified": 1710347506, + "narHash": "sha256-qwKEfLPd6oDugHfX6efCG9A2Z6360aAObYfFnbIKhzE=", "owner": "nix-community", "repo": "nixvim", - "rev": "8569b5c5506247423c39f2b3a0739f12fde41e38", + "rev": "9b9912077e11478460c0d919a0101ace8966f44a", "type": "github" }, "original": { @@ -1753,11 +1758,11 @@ }, "nur": { "locked": { - "lastModified": 1710006296, - "narHash": "sha256-HuOpxTp/VX9FKjm0tn+omw1z8SsJapFtxuKTDdysJdE=", + "lastModified": 1710355483, + "narHash": "sha256-MGYdTEctVmP19adfwmRQ6MrYLdkZIDsZq9pb7yD6dGc=", "owner": "nix-community", "repo": "NUR", - "rev": "414e2ef360397c9e024d09dda6de78455d2e00b2", + "rev": "1afb6fbae070378ea90fcb289a5e13e355a172a1", "type": "github" }, "original": { @@ -1842,11 +1847,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1709904211, - "narHash": "sha256-Vv29QP5eIn9ZEapQzXHqwhjm46sddetiZScTWY0/dlA=", + "lastModified": 1710248332, + "narHash": "sha256-5Ozfx1xSscOrdCQoTLvcJHTtxgQ15YrXpjqce4vdzkQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2397e7a887252aa995d3790164b34b6c76ed94b4", + "rev": "a2e274142f35d21fd28d28655f4af8e8531ab649", "type": "github" }, "original": { @@ -1895,11 +1900,11 @@ "searx-randomizer": "searx-randomizer" }, "locked": { - "lastModified": 1708599757, - "narHash": "sha256-I8cZfd7hvHg2slmXeG4zR4bln0K4oxuJXm/fUwrXrDU=", + "lastModified": 1710314260, + "narHash": "sha256-CD68rniQ+AAzodXLpxgj/mqRxY6bOeRO8zGzZe0nhYc=", "owner": "schizofox", "repo": "schizofox", - "rev": "cc1d66889d057c57011487db77c926fc101fb4ff", + "rev": "9ae87e3a0c0e774890ed8abc10e9461068e92f41", "type": "github" }, "original": { @@ -2150,11 +2155,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1709625704, - "narHash": "sha256-9zUqV1wxUAuRRBMQCUZEf5FjIKMeTEhWTLOfL4+9EiE=", + "lastModified": 1710355616, + "narHash": "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE=", "owner": "Alexays", "repo": "Waybar", - "rev": "4c46d7d245a6c06644d6a0e8857f7140556202ce", + "rev": "32eac3ccb738691974121b77b4af0c47d1cbe524", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4cfc8ae..c1e611d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,12 @@ self, nixpkgs, ... - } @ inputs: let + } @ inputs: { + # TODO steal this from raf when I have time and energy + #lib = import (self + /lib) { inherit inputs; }; inherit (nixpkgs) lib; - in { - nixosConfigurations = import ./hosts {inherit nixpkgs inputs lib;}; + + nixosConfigurations = import ./hosts { inherit inputs; }; }; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix index d6c0596..da3a459 100644 --- a/hosts/chmura/configuration.nix +++ b/hosts/chmura/configuration.nix @@ -31,7 +31,11 @@ in { extraGroups = [ "docker" ]; }; - services.caddy = { + services.caddy = let + redirToFlake = '' + redir https://git.jacekpoz.pl/jacekpoz/niksos + ''; + in { enable = true; virtualHosts."test.jacekpoz.pl".extraConfig = '' reverse_proxy * localhost:3001 @@ -40,6 +44,9 @@ in { root * /srv file_server ''; + + virtualHosts."flake.jacekpoz.pl".extraConfig = redirToFlake; + virtualHosts."flake.jpoz.pl".extraConfig = redirToFlake; }; virtualisation = { diff --git a/hosts/default.nix b/hosts/default.nix index da0d018..e796e58 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,9 +1,9 @@ { - lib, inputs, ... }: let inherit (inputs) self; + inherit (self) lib; in { niks = lib.nixosSystem { system = "x86_64-linux"; diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 0217cc1..4358ecb 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -93,12 +93,6 @@ }; }; - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "qt"; - enableSSHSupport = true; - }; - services.btrfs = { autoScrub = { enable = true; diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index be172a3..d5c0ad5 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -64,12 +64,6 @@ ratbagd.enable = true; }; - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "qt"; - enableSSHSupport = true; - }; - services.btrfs = { autoScrub = { enable = true; diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix index c144922..38c88a4 100644 --- a/modules/tui/neovim.nix +++ b/modules/tui/neovim.nix @@ -75,7 +75,7 @@ in { plugins = { airline = { enable = true; - theme = "catppuccin"; + settings.theme = "catppuccin"; }; fugitive.enable = true; treesitter = { @@ -99,10 +99,12 @@ in { }; coq-nvim = { enable = true; - autoStart = "shut-up"; installArtifacts = true; - recommendedKeymaps = true; - alwaysComplete = false; + settings = { + auto_start = "shut-up"; + keymap.recommended = true; + completion.always = false; + }; }; chadtree = { enable = true; @@ -182,7 +184,7 @@ in { bashls.enable = true; tsserver.enable = true; java-language-server.enable = true; - pylyzer.enable = true; + #pylyzer.enable = true; }; #onAttach = '' # vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')