diff --git a/flake.lock b/flake.lock index 8d927496c5ea998d3b8487cef89bdfa3443e227a..1e5670deedd6ee81efa764a3d7136cfdc6b07b70 100644 --- a/flake.lock +++ b/flake.lock @@ -23,23 +23,6 @@ "type": "github" } }, "nodes": { -{ - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "nodes": { "nixpkgs" "inputs": { "systems": "systems" @@ -374,9 +357,8 @@ "resume": "resume", "tclip": "tclip", "templ": "templ", "tmpl": "tmpl", - "website": "website", + "nodes": { { - "inputs": { "nixpkgs": [ } }, @@ -529,30 +511,6 @@ }, "original": { "type": "git", "url": "https://git.jojodev.com/jolheiser/jolheiser.com" - } - }, - "wsl": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703521177, - "narHash": "sha256-V95s2ypDpdaFGbeG3pvazEE7qdjwZknoauv89DJQvz0=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "ec53b11f0c78572a2b0b5263ae1c46293daaf55f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "type": "github" } }, "xc": { diff --git a/flake.nix b/flake.nix index 62328cfa6784f46d62a93590a34fd568355a27d3..b5b15ed29bcc1d34cd7a6792d9318d95580f7b4a 100644 --- a/flake.nix +++ b/flake.nix @@ -85,12 +85,6 @@ templ = { url = "github:a-h/templ"; inputs.nixpkgs.follows = "nixpkgs"; }; - # WSL - wsl = { - url = "github:nix-community/NixOS-WSL"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; }; outputs = { @@ -98,7 +92,6 @@ nixpkgs, home-manager, agenix, nixpkgs-py36, - wsl, ... } @ inputs: let overlays = [ @@ -156,129 +149,112 @@ }; }; }; { - url = "github:nix-community/home-manager"; + url = "git+https://git.jojodev.com/jolheiser/tmpl"; { - inputs.nixpkgs.follows = "nixpkgs"; + nixpl = { { - }; + url = "git+https://git.jojodev.com/jolheiser/nixpl"; { - agenix = { + gomodinit = { { - url = "github:ryantm/agenix"; - agenix = { + inputs.nixpkgs.follows = "nixpkgs"; -{ nixpkgs.follows = "nixpkgs"; -{ darwin.follows = ""; { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; { - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; { + }; }; + url = "github:nix-community/home-manager"; { - flake-utils.url = "github:numtide/flake-utils"; + nixpkgs, { -{ + home-manager = { inputs.nixpkgs.follows = "nixpkgs"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; { - }; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; description = "jolheiser's nixos config"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; inputs = { { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; home-manager = { { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager"; { - description = "jolheiser's nixos config"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; { - url = "git+https://git.jojodev.com/jolheiser/jolheiser.com"; - inputs = { + inputs.nixpkgs.follows = "nixpkgs"; { - nur.follows = "jolheiser-nur"; - inputs = { + inputs.nixpkgs.follows = "nixpkgs"; { { - gist = { -{ + inputs.nixpkgs.follows = "nixpkgs"; description = "jolheiser's nixos config"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; { - + inputs.nixpkgs.follows = "nixpkgs"; { - nur.follows = "jolheiser-nur"; + else [./apps/nogui]; { - tmpl = { inputs.nixpkgs.follows = "nixpkgs"; - home-manager = { - }; - }) - ]; - inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; { - + inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; { - + inputs.nixpkgs.follows = "nixpkgs"; home-manager = { { + inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-community/home-manager"; { - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/home-manager"; { - # Other flakes + extraSpecialArgs = { { - golink = { + ssh-config = userSecret ./secrets/shared/ssh-config.age; - nixpkgs.follows = "nixpkgs"; description = "jolheiser's nixos config"; { - inputs = { + inputs.nixpkgs.follows = "nixpkgs"; + jolheiser-nur = { { - url = "github:tailscale-dev/tclip"; { - inputs = { + inputs.nixpkgs.follows = "nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - }; - "masala" = nixpkgs.lib.nixosSystem { - nixpkgs.follows = "nixpkgs"; + description = "jolheiser's nixos config"; + description = "jolheiser's nixos config"; { - golink = { + useGlobalPkgs = true; - nixpkgs.follows = "nixpkgs"; description = "jolheiser's nixos config"; - nixpkgs.follows = "nixpkgs"; { - inputs = { +{ home-manager = { { - inputs = { +{ url = "github:nix-community/home-manager"; - ]; }; "matcha" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/machines/masala/default.nix b/machines/masala/default.nix deleted file mode 100644 index 54e85265011c8fd7e66665b39897ea2bc4602296..0000000000000000000000000000000000000000 --- a/machines/masala/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{pkgs, ...}: let - username = "jolheiser"; -in { - imports = [../common/gui]; - - networking.hostName = "masala"; - - wsl = { - enable = true; - defaultUser = username; - startMenuLaunchers = true; - }; - - users.users."${username}" = { - extraGroups = ["wheel" "docker"]; - isNormalUser = true; - }; - - services.openssh.enable = true; - - environment.systemPackages = with pkgs; [ - libxcrypt - py36.python36 - py36.python36Packages.virtualenv - py36.python36Packages.psycopg2 - py36.python36Packages.wheel - py36.python36Packages.setuptools - py36.python36Packages.pip - python3Packages.twine - subversion - ]; - - system.stateVersion = "23.11"; -} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b2fb11ac6a004a4a7c0bda1cf91634017ba802f3..cf1a436d847316c4bc53ad7a963ddcdc686e9fbe 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,10 +2,9 @@ let jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"; matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1 root@matcha"; chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai"; - masala = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0bnlygiFqNwl0mHxcD+t78bTsn1NcHm6L2B4le4FtS root@nixos"; dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53 root@dragonwell"; - all = [jolheiser matcha chai masala dragonwell]; + all = [jolheiser matcha chai dragonwell]; in { "shared/ssh-config.age".publicKeys = all; "shared/ssh-config-work.age".publicKeys = all; @@ -13,8 +12,8 @@ "shared/spotify.age".publicKeys = all; "shared/irc-pw.age".publicKeys = all; "shared/gist-pw.age".publicKeys = all; "shared/git-send-email.age".publicKeys = all; - "work/netrc.age".publicKeys = [jolheiser chai masala]; + "work/netrc.age".publicKeys = [jolheiser chai]; - "work/pip.conf.age".publicKeys = [jolheiser chai masala]; + "work/pip.conf.age".publicKeys = [jolheiser chai]; - "work/pypirc.age".publicKeys = [jolheiser chai masala]; + "work/pypirc.age".publicKeys = [jolheiser chai]; - "work/cifs.age".publicKeys = [jolheiser chai masala]; + "work/cifs.age".publicKeys = [jolheiser chai]; } diff --git a/secrets/shared/gist-pw.age b/secrets/shared/gist-pw.age index 50b30a746d3b830a9678ca4ad7cadeaa4250a096..82a3a1de761612f7331359421f7cc85ad9537e90 100644 --- a/secrets/shared/gist-pw.age +++ b/secrets/shared/gist-pw.age @@ -1,24 +1,22 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI -ivOpO8f87yAm1k/1FL3qhiaS5G/eW7jYV19Mz5QoEXc --> ssh-ed25519 xUMv2w xht8LuQJaV0yhzvwbmYjUsgn3KdUqj8BtumeNRqrP10 -0WlxPmL1t8GqRMX+ll0nnDDPDDhEAOqkJFZKwwFYZ10 --> ssh-ed25519 jo1MPA XPE2K3xYt5ECbDQP5T5VMTsGkIg9awvvLflpPSc522E -G4xPLpMYsOz+5au7BaNk1n5naS5SWaxFKYue6f0gHWA +age-encryption.org/v1 -> ssh-ed25519 JBrabQ QFUSyS+N63P5XCJTbD32yfZ2GIh5J4A1YYL5T3CWDgg +age-encryption.org/v1 i/+qf3N+/p/34jW4of+YaQzQZI/Glab91Gu540ePDI8 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI age-encryption.org/v1 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI -> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI ivOpO8f87yAm1k/1FL3qhiaS5G/eW7jYV19Mz5QoEXc -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI -> ssh-ed25519 xUMv2w xht8LuQJaV0yhzvwbmYjUsgn3KdUqj8BtumeNRqrP10 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI 0WlxPmL1t8GqRMX+ll0nnDDPDDhEAOqkJFZKwwFYZ10 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI -> ssh-ed25519 jo1MPA XPE2K3xYt5ECbDQP5T5VMTsGkIg9awvvLflpPSc522E -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI G4xPLpMYsOz+5au7BaNk1n5naS5SWaxFKYue6f0gHWA +--- WpYUFBbDJptLs3YK9UBQfgfRngN7MFaTrmmWLMMKWxE +pbIWo, kZQ\P;neAC_64'p \ No newline at end of file diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age index 84c7d8d7dcfb7903872a85842d6f8bd43e984536..7553e5dde02fcfa3943814d1b2af5a99555960a5 100644 Binary files a/secrets/shared/git-send-email.age and b/secrets/shared/git-send-email.age differ diff --git a/secrets/shared/irc-pw.age b/secrets/shared/irc-pw.age index 8bef1213e8c9fc3b70f2942cc947f27fbab4f7cf..2ee514e609a1c8c440961004c699983d70cf0e69 100644 --- a/secrets/shared/irc-pw.age +++ b/secrets/shared/irc-pw.age @@ -1,22 +1,22 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw -Y+W5puz47ItyxU6eMYh/2C/s+Qs+CWfA+80tp14ZiZY --> ssh-ed25519 xUMv2w /pGFstD9CQoIfQ++vK4xsacup4DmJLrAbJc8DhbPyG0 -BT9/wTt4UYUPQJL/ZJXNVBfAUUykiyXt2Pc2FQe9Dm4 --> ssh-ed25519 jo1MPA +GG0hnR/eBw122D4dZvbMcsIfQitviv2UUv3I4yiYAs +age-encryption.org/v1 KCsDTbnfxRyY8xXBtaEg9GHMF0eHrF9Ss5OgSSQWDq8 +age-encryption.org/v1 -> ssh-ed25519 JBrabQ KGZMHVVEwuGMkEqa5wM4/cZo7A9lnbySp1Sn2bA3wi4 +age-encryption.org/v1 NlPafvcnBfs1S0iDKqG0zAg7/grGI3VVkWOWhFF5iHQ -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw age-encryption.org/v1 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw -> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw Y+W5puz47ItyxU6eMYh/2C/s+Qs+CWfA+80tp14ZiZY -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw -> ssh-ed25519 xUMv2w /pGFstD9CQoIfQ++vK4xsacup4DmJLrAbJc8DhbPyG0 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw BT9/wTt4UYUPQJL/ZJXNVBfAUUykiyXt2Pc2FQe9Dm4 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw -> ssh-ed25519 jo1MPA +GG0hnR/eBw122D4dZvbMcsIfQitviv2UUv3I4yiYAs +--- 9W+QAbKfdMBX119Hf8t1ZdNbQ8QUN1as6qL6eSvIh34 +\#!s6^ ɑ,1!h0giHQ؂{оV \ No newline at end of file diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age index 8367be420aaa352e41d00088b765aba568ce5037..1b760f021836e9cf922899c0cc05fd8bbee12f4c 100644 Binary files a/secrets/shared/spotify.age and b/secrets/shared/spotify.age differ diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age index 0bee1484646545b4ff59ac2d038db9d46f5f9c68..9b8fde56f01af202dc70e0db12b8a9a9e8d50b19 100644 Binary files a/secrets/shared/ssh-config-work.age and b/secrets/shared/ssh-config-work.age differ diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age index 36801698ebb3e18261b010d254b304a76fae46c3..80eb15da2d00f9cb444c7a3bb0d3bc69eb36c3fc 100644 Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age index 35eb63b6b47b9e7ac328d93b66eb1f5a279926ce..a6afadbaa0419d2ca4f0064a0e3ddca16bbd31d0 100644 Binary files a/secrets/work/cifs.age and b/secrets/work/cifs.age differ diff --git a/secrets/work/netrc.age b/secrets/work/netrc.age index 65acd2f9404d02f18cd0061c2fca40713f58b2ff..774e663c5c8869314c0b8e51858520489b4544ce 100644 --- a/secrets/work/netrc.age +++ b/secrets/work/netrc.age @@ -1,12 +1,17 @@ age-encryption.org/v1 +age-encryption.org/v1 -> ssh-ed25519 E8j6/g Qz7+yH51tMzj1uY98P9MV0tXEf1DCSDCO2lIr/C5Bjc +age-encryption.org/v1 1B8DKpZVzVQfevZ1xfalrpaM40hZiBjL3rKBOwmueE0 +age-encryption.org/v1 -> ssh-ed25519 jo1MPA ZsuqgFfcyKEZINlcqBqc3mnmtM8yE7Vh6dtj4i/D5TI +age-encryption.org/v1 GAw5T8Mqd8LqGXtLZqJ+ADewL5H4wctHHbgIOZOZflg +age-encryption.org/v1 -> ssh-ed25519 JBrabQ Zvf0y/ZYm9ogPC0fZV+J/FCIyRrP48X4ccoVTeV5bFQ +age-encryption.org/v1 uKIKyKDnrAdnDjPBP0oY3NktEBQK9O9VSAykFrjC+24 --> yC7d,N9-grease eFX(X HYK 7L:a -oj6ihhdnlM6qHEUSBecee/K563PIko1Krw8YNoO16cRHtt8y9w age-encryption.org/v1 +-> yC7d,N9-grease eFX(X HYK 7L:a age-encryption.org/v1 -age-encryption.org/v1 +oj6ihhdnlM6qHEUSBecee/K563PIko1Krw8YNoO16cRHtt8y9w diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age index 5262b33b02ec2703b7f0a1f35e9c6b0a46028f35..fc7b9d67e2e53fef09eb8cb662ec6c48ca731d38 100644 --- a/secrets/work/pip.conf.age +++ b/secrets/work/pip.conf.age @@ -1,12 +1,20 @@ age-encryption.org/v1 +age-encryption.org/v1 -> ssh-ed25519 E8j6/g NZuccuIuBc6BV6hSYzyNZlzreL6m+ny6CpopOk23IXU +age-encryption.org/v1 9Ql8ZvhLUmtoSPGyd6kXVQ0VZdhFae50NiCcfhYsr4E +age-encryption.org/v1 -> ssh-ed25519 jo1MPA 7Uzs08jqKXGNDKRLlN8RfEUlCgdrX5rB42GMO+DZCHk +age-encryption.org/v1 YqBJyeRPepYrV32ENUvIlco5qjpFcbwIxnfGUxrbTME +age-encryption.org/v1 -> ssh-ed25519 JBrabQ lNBa2QQK3kvaIhQsSuOrIC/MZI+OLGb+62yF53uGqik +age-encryption.org/v1 JRZKfqjo35uXYqb30A6XmQuBGQlDaMXTuQXVrjSK9Oc +age-encryption.org/v1 -> o&4Y>`-grease 3VH RqXPQ_E < +age-encryption.org/v1 mZGs -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g NZuccuIuBc6BV6hSYzyNZlzreL6m+ny6CpopOk23IXU -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g NZuccuIuBc6BV6hSYzyNZlzreL6m+ny6CpopOk23IXU age-encryption.org/v1 diff --git a/secrets/work/pypirc.age b/secrets/work/pypirc.age index 479a227fae3a1f7baf7714ede04c025e90604d56..8b61bab4706ec97de78ba28d0bcf4b5c8f950c88 100644 Binary files a/secrets/work/pypirc.age and b/secrets/work/pypirc.age differ