Merge pull request 'master' (#1) from master into main

Reviewed-on: #1
This commit is contained in:
etwas 2024-10-23 21:17:30 +00:00
commit 8dbb26ab1d
7 changed files with 113 additions and 7 deletions

View file

@ -74,6 +74,39 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -115,6 +148,41 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1729298361,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1729360442,
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": [
@ -137,11 +205,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1729509737,
"narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
"lastModified": 1729690929,
"narHash": "sha256-cTSekmupaDfrhlpLhBUBrU9mUzBaD6mYsMveTX0bKDg=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
"rev": "64d900abe40057393148bc0283d35c2254dd4f57",
"type": "github"
},
"original": {
@ -188,6 +256,7 @@
"agenix": "agenix",
"catppuccin": "catppuccin",
"home-manager": "home-manager_2",
"lix-module": "lix-module",
"nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
@ -202,11 +271,11 @@
]
},
"locked": {
"lastModified": 1729570661,
"narHash": "sha256-gZj1hMVvZjE4inSUElqQuA9iiUioB/zIqgl0i3XcliU=",
"lastModified": 1729657027,
"narHash": "sha256-olxRDZg+/cQZQPW9pEcKfyubHEzqvQsGRrQBw9kTBGg=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "96cf0aad6fe67a31567a51e54dc6b9fcbe90626a",
"rev": "b9d886969141231ca687a915a2c33b3e85c3085c",
"type": "github"
},
"original": {
@ -229,6 +298,21 @@
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -24,9 +24,15 @@
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
# lesbian the nix
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, ... } @ inputs: {
outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: {
nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
@ -39,6 +45,7 @@
# List all Modules to load
modules = [
nixos-hardware.nixosModules.framework-13-7040-amd
lix-module.nixosModules.default
nix-index-database.nixosModules.nix-index
agenix.nixosModules.default
./modules

View file

@ -16,6 +16,12 @@
owner = "rhea";
symlink = false;
};
age.secrets.gcd_etwas = {
file = ../secrets/1bvps.age;
path = "/home/rhea/.ssh/id_gcd_etwas";
owner = "rhea";
symlink = false;
};
nix.extraOptions = ''
!include ${config.age.secrets.access-tokens-github.path}

View file

@ -34,6 +34,7 @@
jetbrains.idea-ultimate
jetbrains.pycharm-professional
jetbrains.jdk
jetbrains.rust-rover
];
nixpkgs.config.vesktop.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
}

View file

@ -9,6 +9,13 @@
hostname = "178.254.43.196";
identityFile = [ "/home/rhea/.ssh/id_1bvps" ];
};
"gcd-etwas" = {
host = "gcd-etwas";
hostname = "git.catgirl.dog";
identityFile = [ "/home/rhea/.ssh/id_gcd_etwas" ];
user = "git";
port = 222;
};
};
};
}

BIN
secrets/gcd_etwas.age Normal file

Binary file not shown.

View file

@ -5,4 +5,5 @@ in
{
"gh.age".publicKeys = [ rhea-laptop ];
"1bvps.age".publicKeys = [ rhea-laptop ];
"gcd_etwas.age".publicKeys = [ rhea-laptop ];
}