misschloe/nix-config
1
0
Fork 0
mirror of https://github.com/harryssecret/homelab-nix.git synced 2025-08-08 06:30:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

solved conflicts

Browse source
This commit is contained in:
chloe 2025-07-25 21:06:28 +02:00
parent 76fb6a0531
commit e9d297b9ac
2 changed files with 36 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

105
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1753260820, "lastModified": 1753284130,
"narHash": "sha256-hh7QESW339Wp0YqgcFIFL66JPN8SV3j2zdGShfQH+Fw=", "narHash": "sha256-qadXtVNH5qFiD3zIAk7mk6E8kV+TuK86a7TUhs0kouc=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "227c41fd57210559a05720bece5453369d7abe0f", "rev": "6365c59e7506fd3e6e5050c8184b41aa7410d6e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753181343, "lastModified": 1753373145,
"narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", "narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", "rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +358,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753239105, "lastModified": 1753372565,
"narHash": "sha256-b6kNz4HI/K/XANrGbBLwE4e0c9DsJ+PkKfAPpZMX1mE=", "narHash": "sha256-C6hTlYrguEZzc02JDAsht0i/wxAxgqvv2MGhJrHzNbw=",
"rev": "8a2d25054ddff44dd8878154b702365eb1966a78", "rev": "e88a85bd928afe02adaaea254eecde44d59c769d",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a2d25054ddff44dd8878154b702365eb1966a78.tar.gz?rev=8a2d25054ddff44dd8878154b702365eb1966a78" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e88a85bd928afe02adaaea254eecde44d59c769d.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -381,15 +381,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751909859, "lastModified": 1751240025,
"narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",
"rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"
} }
}, },
"miovim": { "miovim": {
@ -412,32 +412,12 @@
"url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git"
} }
}, },
"moonlight": { "musnix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgsUnstable" "nixpkgsUnstable"
] ]
}, },
"locked": {
"lastModified": 1753392240,
"narHash": "sha256-4U0ABI8mT/C4mySei6nlkvsvr62dA+5BdTSEFrZkMlM=",
"owner": "moonlight-mod",
"repo": "moonlight",
"rev": "7248b01a141412f7cc0b4224eead0f90443780aa",
"type": "github"
},
"original": {
"owner": "moonlight-mod",
"ref": "develop",
"repo": "moonlight",
"type": "github"
}
},
"musnix": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": { "locked": {
"lastModified": 1741303672, "lastModified": 1741303672,
"narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=",
@ -463,11 +443,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1753258173, "lastModified": 1753343196,
"narHash": "sha256-a7ri+24SEelYz1P1VyO2joZrXQgWhc4g6Iy5i/YROI0=", "narHash": "sha256-o9veRunwEQOhokmU9J+sQao/TRGtgwK20CGCiHtzKdM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "5c2f79eef3dbe9522b6e79fb7f1d99dd593e478a", "rev": "e2091f21d83fd357ebb79ff566428826bbb4f565",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +459,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753225057, "lastModified": 1753271847,
"narHash": "sha256-/Z6FyO4cZ9SGa8X7l7MmEXoKlZWCXgv65qZ9HYbuDvw=", "narHash": "sha256-RuuJ3b4otjQGraffcktEvP6Wk54MCHWwXnvoIy01dyo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "1685c44dd463217db01643a97163420ed9f5b177", "rev": "0dcdd65dcc08483d9a5c106f62b862a9de30983e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,11 +593,11 @@
}, },
"nixpkgsSmall": { "nixpkgsSmall": {
"locked": { "locked": {
"lastModified": 1753208034, "lastModified": 1753328706,
"narHash": "sha256-w24+7Iu031O5iAcWY+exrtRkc60Q9Q3qs+LqhBxQiTg=", "narHash": "sha256-Ho3kXSPtqLGRlvW3SeOc0QyB7fGyHXB2EuieEpe+U4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f7a24d6c01fc1875650ff6f7849126910fe9369", "rev": "25ff20a127c4136c63c44d718db4d82695cb999a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -629,11 +609,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1752950548, "lastModified": 1753250450,
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,22 +656,6 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1740695751,
"narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1753151930, "lastModified": 1753151930,
"narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=",
@ -709,11 +673,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1753115646, "lastModified": 1753345091,
"narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "92c2e04a475523e723c67ef872d8037379073681", "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -810,7 +774,6 @@
"lix": "lix", "lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"miovim": "miovim", "miovim": "miovim",
"moonlight": "moonlight",
"musnix": "musnix", "musnix": "musnix",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
@ -973,11 +936,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753069499, "lastModified": 1753374305,
"narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", "narHash": "sha256-z+NsaMTaEbt+ZyDoPF9WQOtHrDnBPeFrvzmXIXXljoo=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", "rev": "6b8585d94444d6f13e59524e7f8e5d27016e92ac",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
hosts/goober/features/software/workstation.nix
View file

@ -23,6 +23,7 @@
musnix.rtcqs.enable = true; musnix.rtcqs.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zathura zathura
qutebrowser
# music editing software # music editing software
reaper reaper
surge surge
@ -65,7 +66,7 @@
kicad kicad
ente-auth ente-auth
ente-web ente-web
jetbrains.rider # jetbrains.rider
revolt-desktop revolt-desktop
exactaudiocopy exactaudiocopy
picard picard