diff --git a/flake.lock b/flake.lock index 1eb8499..faa81e0 100644 --- a/flake.lock +++ b/flake.lock @@ -304,6 +304,26 @@ "type": "github" } }, + "glide-browser": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767296470, + "narHash": "sha256-4VpU9zSO4mHV4kaqhs6Wkt7UdNwbb/6PdKWgyRkpw64=", + "owner": "glide-browser", + "repo": "glide.nix", + "rev": "2778e385e37330c9effd6c66252d940e7ec8ac95", + "type": "github" + }, + "original": { + "owner": "glide-browser", + "repo": "glide.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -597,6 +617,7 @@ "root": { "inputs": { "agenix": "agenix", + "glide-browser": "glide-browser", "home-manager": "home-manager_2", "impermanence": "impermanence", "nix-zulip": "nix-zulip", diff --git a/flake.nix b/flake.nix index b82efd8..918cd6e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,10 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; + glide-browser = { + url = "github:glide-browser/glide.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -41,6 +45,7 @@ }; outputs = { agenix, + glide-browser, home-manager, impermanence, nixos-mailserver, @@ -74,6 +79,7 @@ { nixpkgs.overlays = [ agenix.overlays.default + glide-browser.overlays.default nur.overlays.default nix-zulip'.overlays.default ]; diff --git a/users.nix b/users.nix index 8654bc1..d528ff0 100644 --- a/users.nix +++ b/users.nix @@ -19,22 +19,6 @@ in { "wheel" ]; }; - "mtgmonkey" = { - isNormalUser = true; - description = "mtgmonkey"; - hashedPasswordFile = builtins.toString config.age.secrets.mtgmonkey-pw.path; - extraGroups = [ - (lib.mkIf - (machine == machines.lenovo) - "networkmanager") - "wheel" - ]; - openssh.authorizedKeys.keys = [ - (lib.mkIf - (machine == machines."109-199-104-83") - config.pub-keys.ssh.andromeda) - ]; - }; }; environment.persistence."/persist".users = lib.mkIf config.environment.persistence."/persist".enable ( builtins.mapAttrs @@ -45,7 +29,7 @@ in { ".backups" ".local/share/Anki2" ".local/share/chat.fluffy.fluffychat" - ".local/share.zoxide" + ".local/share/zoxide" ".ssh" "conf" "Downloads" diff --git a/users/andromeda/home.nix b/users/andromeda/home.nix index 6be79be..5960690 100644 --- a/users/andromeda/home.nix +++ b/users/andromeda/home.nix @@ -35,6 +35,7 @@ in { pkgs.dust pkgs.fluffychat pkgs.fzf + pkgs.glide-browser pkgs.glow pkgs.grim pkgs.jmtpfs