From ea7501f60610d9040fd27020290fc620b2b8b8cf Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Fri, 5 Jul 2024 23:06:11 +0200 Subject: [PATCH] challenger: update flake, various small fixes --- flake.lock | 46 +++++++++++++------------- flake.nix | 25 ++------------ home/neovim.nix | 2 +- hosts/challenger/services/jellyfin.nix | 5 --- 4 files changed, 27 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 114f425..53a17d4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "extra-config": { + "locked": { + "lastModified": 1720193877, + "narHash": "sha256-f+ZtFQTbbmieTYLANn0AOz439/sIH+HumOAhItdYYig=", + "ref": "refs/heads/main", + "rev": "f9817deef3d4e56a31a89ee93419a9acd278e922", + "revCount": 9, + "type": "git", + "url": "file:///home/felixalb/nix-extra-config" + }, + "original": { + "type": "git", + "url": "file:///home/felixalb/nix-extra-config" + } + }, "flake-compat": { "flake": false, "locked": { @@ -164,11 +179,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718086528, - "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", + "lastModified": 1719956923, + "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", + "rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "type": "github" }, "original": { @@ -180,14 +195,14 @@ }, "root": { "inputs": { + "extra-config": "extra-config", "home-manager": "home-manager", "matrix-synapse-next": "matrix-synapse-next", "nix-darwin": "nix-darwin", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_3", "sops-nix": "sops-nix", - "unstable": "unstable", - "voyager-addons": "voyager-addons" + "unstable": "unstable" } }, "sops-nix": { @@ -228,11 +243,11 @@ }, "unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -241,21 +256,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "voyager-addons": { - "locked": { - "lastModified": 1717176924, - "narHash": "sha256-pYq/v0RNwHshSZf2OeH3P6Aa4/zHGDAJq7Z2Ah9i700=", - "ref": "refs/heads/main", - "rev": "15f32cc6b828c56cb6a954de0096b81f291100d9", - "revCount": 8, - "type": "git", - "url": "file:///home/felixalb/voyager-addons" - }, - "original": { - "type": "git", - "url": "file:///home/felixalb/voyager-addons" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ecf41a7..ebede7f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,7 @@ matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - # voyager-addons.url = "git+ssh://git@git.feal.no:2222/felixalb/voyager-addons.git"; - voyager-addons.url = "git+file:///home/felixalb/voyager-addons"; + extra-config.url = "git+file:///home/felixalb/nix-extra-config"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -30,7 +29,7 @@ , nixpkgs , sops-nix , unstable - , voyager-addons + , extra-config , ... }@inputs: let pkgs-overlay = final: prev: { @@ -48,25 +47,6 @@ in { nixosConfigurations = { - voyager = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - }; - modules = [ - # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) - - ./hosts/voyager/configuration.nix - voyager-addons.nixosModules.default - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users."felixalb" = import ./hosts/voyager/home.nix; - } - ]; - }; challenger = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { @@ -77,6 +57,7 @@ ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) ./hosts/challenger/configuration.nix + extra-config.nixosModules.default sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home/neovim.nix b/home/neovim.nix index fbfae80..d146061 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -21,7 +21,7 @@ in { telescope-nvim nvim-lspconfig - copilot-vim + # copilot-vim nvim-treesitter coc-css diff --git a/hosts/challenger/services/jellyfin.nix b/hosts/challenger/services/jellyfin.nix index 39c63aa..2fccb67 100644 --- a/hosts/challenger/services/jellyfin.nix +++ b/hosts/challenger/services/jellyfin.nix @@ -36,9 +36,4 @@ add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), battery=(), bluetooth=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), keyboard-map=(), local-fonts=(), magnetometer=(), microphone=(), payment=(), publickey-credentials-get=(), serial=(), sync-xhr=(), usb=(), xr-spatial-tracking=()" always; ''; }; - - fileSystems."/tank/media/jellyfin/Music" = { - device = "tank/media/music"; - fsType = "zfs"; - }; }