chore: refactor
This commit is contained in:
parent
f06011e890
commit
e6b6325ba6
203
flake.lock
203
flake.lock
|
@ -351,42 +351,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_6": {
|
||||
"inputs": {
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_7": {
|
||||
"inputs": {
|
||||
"systems": "systems_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fourmolu-nix": {
|
||||
"locked": {
|
||||
"lastModified": 1707266073,
|
||||
|
@ -693,28 +657,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"remarks",
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729742964,
|
||||
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-jetbrains-plugins": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
|
@ -895,38 +837,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1734649271,
|
||||
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1730157240,
|
||||
"narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1739863612,
|
||||
"narHash": "sha256-UbtgxplOhFcyjBcNbTVO8+HUHAl/WXFDOb6LvqShiZo=",
|
||||
|
@ -1012,28 +922,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"poetry2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"systems": "systems_8",
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735132927,
|
||||
"narHash": "sha256-bTmhcWv+sByoVUDZv91TWkw1752ME+pG2n3rNpf8Tds=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"rev": "06eb56b63de2f49ae62352b5927b9285591f982a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
@ -1057,26 +945,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"remarks": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"poetry2nix": "poetry2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741079709,
|
||||
"narHash": "sha256-N3o82Bb2/t52AjqSl+oTRN/dSM0M5yWsyW+V0I48nQM=",
|
||||
"owner": "Azeirah",
|
||||
"repo": "remarks",
|
||||
"rev": "48b7d5c8a9e6944e44006e5e8e08aa0f90f0cd91",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Azeirah",
|
||||
"repo": "remarks",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
|
@ -1089,7 +957,6 @@
|
|||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nixvim": "nixvim",
|
||||
"remarks": "remarks",
|
||||
"wezterm": "wezterm",
|
||||
"xmonad-config": "xmonad-config"
|
||||
}
|
||||
|
@ -1205,50 +1072,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_7": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_8": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "systems",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"systems_9": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -1292,31 +1115,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"remarks",
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730120726,
|
||||
"narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wezterm": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"freetype2": "freetype2",
|
||||
"harfbuzz": "harfbuzz",
|
||||
"libpng": "libpng",
|
||||
|
@ -1350,7 +1151,7 @@
|
|||
"git-hooks": "git-hooks_2",
|
||||
"haskell-flake": "haskell-flake",
|
||||
"nixos-unified": "nixos-unified",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741362790,
|
||||
|
|
|
@ -32,11 +32,12 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Add any other flake you might need.
|
||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||
# Our personal flakes
|
||||
nixvim.url = "git+https://git.sajenim.dev/jasmine/nvim.nix.git";
|
||||
xmonad-config.url = "git+https://git.sajenim.dev/jasmine/xmonad-config.git";
|
||||
remarks.url = "github:Azeirah/remarks";
|
||||
|
||||
# Add any other flake you might need.
|
||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||
nix-jetbrains-plugins.url = "github:theCapypara/nix-jetbrains-plugins";
|
||||
};
|
||||
|
||||
|
|
|
@ -12,13 +12,7 @@
|
|||
../common/optional/yubikey.nix
|
||||
|
||||
# Services
|
||||
./services/amdgpu-clocks
|
||||
./services/flatpak
|
||||
./services/libinput
|
||||
./services/ollama
|
||||
./services/printers
|
||||
./services/udev
|
||||
./services/xserver
|
||||
./services
|
||||
|
||||
# Setup our hardware
|
||||
./hardware-configuration.nix
|
||||
|
|
11
nixos/fuchsia/services/default.nix
Normal file
11
nixos/fuchsia/services/default.nix
Normal file
|
@ -0,0 +1,11 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./amdgpu-clocks
|
||||
./flatpak
|
||||
./libinput
|
||||
./ollama
|
||||
./printers
|
||||
./udev
|
||||
./xserver
|
||||
];
|
||||
}
|
|
@ -7,24 +7,10 @@
|
|||
../common/users/sajenim
|
||||
|
||||
# Services
|
||||
./services/borgbackup
|
||||
./services/crowdsec
|
||||
./services/forgejo
|
||||
./services/lighttpd
|
||||
./services/minecraft
|
||||
./services/mpd
|
||||
./services/paperless-ngx
|
||||
./services/postgresql
|
||||
./services/traefik
|
||||
./services/wiki-js
|
||||
./services
|
||||
|
||||
# Multimedia
|
||||
./multimedia/jellyfin
|
||||
./multimedia/lidarr
|
||||
./multimedia/prowlarr
|
||||
./multimedia/qbittorrent
|
||||
./multimedia/radarr
|
||||
./multimedia/sonarr
|
||||
./multimedia
|
||||
|
||||
# Setup our hardware
|
||||
./hardware-configuration.nix
|
||||
|
|
10
nixos/viridian/multimedia/default.nix
Normal file
10
nixos/viridian/multimedia/default.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./jellyfin
|
||||
./lidarr
|
||||
./prowlarr
|
||||
./qbittorrent
|
||||
./radarr
|
||||
./sonarr
|
||||
];
|
||||
}
|
14
nixos/viridian/services/default.nix
Normal file
14
nixos/viridian/services/default.nix
Normal file
|
@ -0,0 +1,14 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./borgbackup
|
||||
./crowdsec
|
||||
./forgejo
|
||||
./lighttpd
|
||||
./minecraft
|
||||
./mpd
|
||||
./paperless-ngx
|
||||
./postgresql
|
||||
./traefik
|
||||
./wiki-js
|
||||
];
|
||||
}
|
Loading…
Reference in a new issue