diff --git a/flake.lock b/flake.lock index 9b2150b..8c9f7aa 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1717279440, - "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "717cc95983cdc357bc347d70be20ced21f935843", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -58,27 +34,6 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", - "owner": "ipetkov", - "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "flake-compat": [ "lanzaboote", @@ -168,22 +123,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -199,7 +138,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -215,7 +154,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -271,12 +210,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -287,7 +229,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1715533576, @@ -306,7 +248,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1696331477, @@ -323,24 +265,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -358,7 +282,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_4" }, @@ -376,7 +300,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_5" }, @@ -394,7 +318,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_7" }, @@ -441,16 +365,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -505,10 +429,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", + "crane": "crane", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -532,11 +456,11 @@ }, "mnw": { "locked": { - "lastModified": 1732376520, - "narHash": "sha256-fG8ozQpH48S8WBYilbq4iIZRuVUy2kxQVJs4y4e+e/o=", + "lastModified": 1731821965, + "narHash": "sha256-QiGi/HBQRnIRGY4gQPuH7T3hr7NznOpEO7qNpF5ldmE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "5d4d187cf739a7d80b3b38646d8dd4ae98f857a8", + "rev": "5fe5c41975ed0af55f55dc37cd28ba906a5d015e", "type": "github" }, "original": { @@ -570,7 +494,7 @@ "neovim-flake": { "inputs": { "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "mnw": "mnw", "nil": "nil", "nixpkgs": [ @@ -744,7 +668,7 @@ "nix-homebrew": { "inputs": { "brew-src": "brew-src", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_3" }, @@ -812,22 +736,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -843,7 +751,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1719099622, "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", @@ -890,16 +798,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -926,11 +834,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1731604482, - "narHash": "sha256-r75GaDBrZFNHSvhcTR5e0JlgSBALvmwFpgNq58pZ4Pg=", + "lastModified": 1732034035, + "narHash": "sha256-VMIIgtuBNksCRvcHxFtkzveEYz2w7lO+ltuC23QpBD8=", "owner": "matter-labs", "repo": "nixsgx", - "rev": "4ec107365fb8403b5dddf35f0ef940bc5657af22", + "rev": "b6b4571d43616ffc7719941daafa350a453a9d44", "type": "github" }, "original": { @@ -2603,7 +2511,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1681413034, @@ -2641,7 +2549,6 @@ }, "root": { "inputs": { - "attic": "attic", "darwin": "darwin", "disko": "disko", "home-manager": "home-manager", @@ -2714,7 +2621,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], @@ -2738,7 +2645,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixsgx-flake", @@ -2761,7 +2668,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" @@ -2787,7 +2694,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1719268571, @@ -2910,11 +2817,11 @@ }, "unstable": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6db88cc..30b38d1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Harald Hoyer's Nix Configurations"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; # NixPkgs Unstable (nixos-unstable) unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -35,11 +35,12 @@ flake = false; }; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; neovim-flake.url = "github:NotAShelf/nvf/v0.6"; neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; + neovim-flake.inputs.mnw.url = "github:Gerg-L/mnw?rev=5fe5c41975ed0af55f55dc37cd28ba906a5d015e"; disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; @@ -54,9 +55,6 @@ simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs"; - - attic.url = "github:zhaofengli/attic"; - attic.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -90,7 +88,6 @@ sops-nix.nixosModules.sops disko.nixosModules.disko simple-nixos-mailserver.nixosModule - attic.nixosModules.atticd ]; overlays = with inputs; [ nixsgx-flake.overlays.default ]; diff --git a/modules/home/cli-apps/neovim/default.nix b/modules/home/cli-apps/neovim/default.nix index 0744213..8cecfd4 100644 --- a/modules/home/cli-apps/neovim/default.nix +++ b/modules/home/cli-apps/neovim/default.nix @@ -35,7 +35,6 @@ in lspkind.enable = false; lightbulb.enable = true; lspsaga.enable = false; - nvimCodeActionMenu.enable = true; trouble.enable = true; lspSignature.enable = true; lsplines.enable = true; @@ -87,9 +86,6 @@ in fidget-nvim.enable = true; indentBlankline = { enable = true; - fillChar = null; - eolChar = null; - showCurrContext = true; }; cursorline = { enable = true; @@ -140,7 +136,7 @@ in vim.git = { enable = true; gitsigns.enable = true; - gitsigns.codeActions = false; # throws an annoying debug message + #gitsigns.codeActions = false; # throws an annoying debug message }; vim.minimap = { @@ -188,6 +184,7 @@ in }; vim.ui = { + fastaction.enable = true; borders.enable = true; noice.enable = true; colorizer.enable = true; @@ -201,12 +198,12 @@ in enable = true; columnAt.languages = { # this is a freeform module, it's `buftype = int;` for configuring column position - nix = 110; - ruby = 120; - java = 130; + nix = "110"; + ruby = "120"; + java = "130"; go = [ - 90 - 130 + "90" + "130" ]; }; }; diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix index 719a890..17e7dda 100644 --- a/modules/nixos/services/gui/default.nix +++ b/modules/nixos/services/gui/default.nix @@ -62,15 +62,9 @@ in #security.tpm2.pkcs11.enable = true; - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; hardware.opengl = { enable = true; - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ onevpl-intel-gpu intel-compute-runtime diff --git a/systems/x86_64-linux/sgx-attic/atticd.nix b/systems/x86_64-linux/sgx-attic/atticd.nix index b8704d6..912189c 100644 --- a/systems/x86_64-linux/sgx-attic/atticd.nix +++ b/systems/x86_64-linux/sgx-attic/atticd.nix @@ -20,7 +20,7 @@ enable = true; # Replace with absolute path to your credentials file - credentialsFile = "/etc/atticd.env"; + environmentFile = "/etc/atticd.env"; settings = { api-endpoint = "https://attic.teepot.org/";