diff options
| -rw-r--r-- | flake.lock | 261 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | hosts/sofue/programs.nix | 9 | ||||
| -rw-r--r-- | nix/programs/bash.nix | 1 | ||||
| -rw-r--r-- | themes/christmas_rwby/merry_christmas!/preview.jpg | bin | 0 -> 430732 bytes | |||
| -rw-r--r-- | themes/christmas_rwby/merry_christmas!/project.json | 28 | ||||
| -rw-r--r-- | themes/christmas_rwby/merry_christmas!/scene.pkg | bin | 0 -> 7433067 bytes | |||
| -rw-r--r-- | themes/dva_halloween/__d_va_overwatch/preview.jpg | bin | 0 -> 276132 bytes | |||
| -rw-r--r-- | themes/dva_halloween/__d_va_overwatch/project.json | 27 | ||||
| -rw-r--r-- | themes/dva_halloween/__d_va_overwatch/scene.pkg | bin | 0 -> 6292689 bytes |
10 files changed, 271 insertions, 64 deletions
@@ -1,20 +1,43 @@ { "nodes": { + "camu": { + "inputs": { + "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", + "nixos-wsl": "nixos-wsl", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732750551, + "narHash": "sha256-ynuL2w3pvy9mg6DiVRS6cnDYHWUQxP4s48xc5g6C+Z8=", + "ref": "refs/heads/master", + "rev": "01ab651a6c4a7894eef972f5236996754b0967bb", + "revCount": 54, + "type": "git", + "url": "https://git.akon.city/camu" + }, + "original": { + "type": "git", + "url": "https://git.akon.city/camu" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "jovian": "jovian", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732150710, - "narHash": "sha256-H6ps/jlPn3kkGtrZeduLtfMnV8htI117/qUgMtUzJBM=", + "lastModified": 1732715105, + "narHash": "sha256-WGf8bzwNEgbWjM9aTFv9ZCGrBQEfg0fYd4FSoVa2gDs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "4621aec08aa50869a305e275c2b8a0c766f3b59b", + "rev": "8f153d013632e6036e8bec6377cc5ed7d2ad14df", "type": "github" }, "original": { @@ -25,6 +48,22 @@ } }, "flake-compat": { + "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" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1717312683, "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", @@ -106,6 +145,23 @@ "type": "github" }, "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "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" @@ -114,20 +170,21 @@ "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", + "camu", "nixpkgs" ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { "owner": "nix-community", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -135,15 +192,36 @@ "home-manager_2": { "inputs": { "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { @@ -161,11 +239,11 @@ ] }, "locked": { - "lastModified": 1732032028, - "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", + "lastModified": 1732648910, + "narHash": "sha256-1F83DUfEHnCZpGY4UOlWaamWoDx8eZ9tHaUF51p2hng=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "65dc04371cf914c9af4f073638821e4787303005", + "rev": "e86d2ad72094354326887bd6fe156f327d63d491", "type": "github" }, "original": { @@ -176,15 +254,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1731845570, - "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", + "lastModified": 1732450403, + "narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", + "rev": "c817444fb8a3042c26be57d8640fb744bc1b516c", "type": "github" }, "original": { @@ -195,17 +273,17 @@ }, "mauri": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1731175601, - "narHash": "sha256-1y1VlxyUw4FUF1MkUeYAwdZD6A7kqRcKm/PFe02L3T0=", + "lastModified": 1732657292, + "narHash": "sha256-nFfGyWwMkIrHFLGA6TmhIKTG5G6uLGiygcDtXGDmU54=", "ref": "refs/heads/master", - "rev": "f9eea19c5a13de915e9df49cc0260aa98b82b9f3", - "revCount": 58, + "rev": "37a45ee3ae3a7b6b1754a5199ca1750529b09575", + "revCount": 60, "type": "git", "url": "https://git.akon.city/mauri" }, @@ -218,15 +296,15 @@ "inputs": { "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731682758, - "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", + "lastModified": 1732631228, + "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", + "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf", "type": "github" }, "original": { @@ -287,11 +365,11 @@ ] }, "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "lastModified": 1731952509, + "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", "type": "github" }, "original": { @@ -302,11 +380,27 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixos-hardware_2": { + "locked": { + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -316,29 +410,50 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1731682434, + "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1732410305, + "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "type": "github" }, "original": { @@ -349,7 +464,7 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ @@ -357,11 +472,11 @@ ] }, "locked": { - "lastModified": 1732202815, - "narHash": "sha256-AHyi0SUuCkhRM1ZOB6ylp8T1f9SuRtwuyRaRgeoK9xs=", + "lastModified": 1732889990, + "narHash": "sha256-7mbQWCaIouZ5S7c7x7dSc0Ep6Rg49l+L9Ys6qaDlNlo=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "8443e425803e753f54cfab41754cd648e39b2110", + "rev": "384460ee819581612281f6ef7aeafbaab589c0c4", "type": "github" }, "original": { @@ -372,11 +487,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -388,11 +519,11 @@ }, "nur": { "locked": { - "lastModified": 1732200980, - "narHash": "sha256-I7iT9Pvfvwdn/HwduB0iypeZ0ZLe2S7ISeoOVu5MuWE=", + "lastModified": 1732909490, + "narHash": "sha256-ov9YvDdaB+kdrvL1Qsh5esv646bldkHeADInqr8YVjk=", "owner": "nix-community", "repo": "NUR", - "rev": "6b4e7eb30278bbf9fda14859347035fe3fc45eea", + "rev": "2c2351efdee742e0a90da08d597c34b119287abe", "type": "github" }, "original": { @@ -403,12 +534,13 @@ }, "root": { "inputs": { + "camu": "camu", "chaotic": "chaotic", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "mauri": "mauri", "nix-github-actions": "nix-github-actions_2", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixos-hardware": "nixos-hardware_2", + "nixpkgs": "nixpkgs_2", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "umu": "umu" @@ -444,6 +576,21 @@ "type": "github" } }, + "systems_3": { + "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": [ @@ -474,11 +621,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1731893168, - "narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=", + "lastModified": 1732905608, + "narHash": "sha256-5SJmg++Oi6IgbpzoUmqt1HFWggM1oejMYPkRc+z/woo=", "ref": "refs/heads/main", - "rev": "9f580b251ca66950bb436c09afd2b9585eed74ba", - "revCount": 840, + "rev": "7f3f601ea4224ef0af3967e9997a9603f1f06d41", + "revCount": 860, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -29,13 +29,17 @@ url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs"; }; + camu = { + url = "git+https://git.akon.city/camu"; + inputs.nixpkgs.follows = "nixpkgs"; + }; mauri = { url = "git+https://git.akon.city/mauri"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, nixos-hardware, home-manager, nur, nixpkgs-wayland, umu, nix-github-actions, chaotic, mauri }: let + outputs = { self, nixpkgs, nixos-hardware, home-manager, nur, nixpkgs-wayland, umu, nix-github-actions, chaotic, camu, mauri }: let local-fonts = { name = "Local Fonts"; src = self; @@ -140,7 +144,8 @@ nur.overlay nixpkgs-wayland.overlay (self: super: { local-fonts = super.stdenv.mkDerivation local-fonts; }) - (self: super: { mauri = mauri.packages.${system}.default.overrideAttrs (old: {});}) + (self: super: { camu = camu.packages.${system}.default; }) + (self: super: { mauri = mauri.packages.${system}.default; }) (self: super: { umu = umu.packages.${super.system}.umu.override { version = "${umu.shortRev}"; }; }) (self: super: { mpv-unwrapped = super.mpv-unwrapped.override { cddaSupport = true; }; diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix index 6435b02..36c42f6 100644 --- a/hosts/sofue/programs.nix +++ b/hosts/sofue/programs.nix @@ -1,5 +1,7 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ + gftp + dia cdrtools #ardour audacity @@ -12,13 +14,12 @@ wineWowPackages.staging winetricks cabextract + qbittorrent + ungoogled-chromium (pkgs.discord.override { withOpenASAR = true; }) imv mpv - gftp - qbittorrent - #ungoogled-chromium - #dia + camu mauri ]; } diff --git a/nix/programs/bash.nix b/nix/programs/bash.nix index 3c29785..28f4745 100644 --- a/nix/programs/bash.nix +++ b/nix/programs/bash.nix @@ -23,7 +23,6 @@ denpa = "ssh moyo -t 'ssh 192.168.122.89'"; rod = "ssh -p 1738 rod"; bmrg = "ssh boomerang"; - cmv = "$HOME/c/camu/scripts/cmv.sh"; cmv-add = "$HOME/c/camu/scripts/cmv_add.sh"; cmv-pause = "cmv-add PAUSE"; cmv-next = "cmv-add NEXT"; diff --git a/themes/christmas_rwby/merry_christmas!/preview.jpg b/themes/christmas_rwby/merry_christmas!/preview.jpg Binary files differnew file mode 100644 index 0000000..207010d --- /dev/null +++ b/themes/christmas_rwby/merry_christmas!/preview.jpg diff --git a/themes/christmas_rwby/merry_christmas!/project.json b/themes/christmas_rwby/merry_christmas!/project.json new file mode 100644 index 0000000..5a67930 --- /dev/null +++ b/themes/christmas_rwby/merry_christmas!/project.json @@ -0,0 +1,28 @@ +{
+ "contentrating" : "Questionable",
+ "description" : "https://www.pixiv.net/en/artworks/78473294",
+ "file" : "scene.json",
+ "general" :
+ {
+ "properties" :
+ {
+ "schemecolor" :
+ {
+ "order" : 0,
+ "text" : "ui_browse_properties_scheme_color",
+ "type" : "color",
+ "value" : "0.57255 0.18039 0.23137"
+ }
+ }
+ },
+ "preview" : "preview.jpg",
+ "ratingsex" : "mild",
+ "ratingviolence" : "none",
+ "tags" : [ "Anime" ],
+ "title" : "Merry Christmas!!! [100wang]",
+ "type" : "scene",
+ "version" : 8,
+ "visibility" : "private",
+ "workshopid" : "3111904341",
+ "workshopurl" : "steam://url/CommunityFilePage/3111904341"
+}
\ No newline at end of file diff --git a/themes/christmas_rwby/merry_christmas!/scene.pkg b/themes/christmas_rwby/merry_christmas!/scene.pkg Binary files differnew file mode 100644 index 0000000..1db7afa --- /dev/null +++ b/themes/christmas_rwby/merry_christmas!/scene.pkg diff --git a/themes/dva_halloween/__d_va_overwatch/preview.jpg b/themes/dva_halloween/__d_va_overwatch/preview.jpg Binary files differnew file mode 100644 index 0000000..54c370f --- /dev/null +++ b/themes/dva_halloween/__d_va_overwatch/preview.jpg diff --git a/themes/dva_halloween/__d_va_overwatch/project.json b/themes/dva_halloween/__d_va_overwatch/project.json new file mode 100644 index 0000000..2408f56 --- /dev/null +++ b/themes/dva_halloween/__d_va_overwatch/project.json @@ -0,0 +1,27 @@ +{
+ "contentrating" : "Questionable",
+ "file" : "scene.json",
+ "general" :
+ {
+ "properties" :
+ {
+ "schemecolor" :
+ {
+ "order" : 0,
+ "text" : "ui_browse_properties_scheme_color",
+ "type" : "color",
+ "value" : "0.80392 0.53333 0.43137"
+ }
+ }
+ },
+ "preview" : "preview.jpg",
+ "ratingsex" : "mild",
+ "ratingviolence" : "none",
+ "tags" : [ "Anime" ],
+ "title" : "D.Va Halloween [Lasterk]",
+ "type" : "scene",
+ "version" : 1,
+ "visibility" : "private",
+ "workshopid" : "3374168885",
+ "workshopurl" : "steam://url/CommunityFilePage/3374168885"
+}
\ No newline at end of file diff --git a/themes/dva_halloween/__d_va_overwatch/scene.pkg b/themes/dva_halloween/__d_va_overwatch/scene.pkg Binary files differnew file mode 100644 index 0000000..898aec2 --- /dev/null +++ b/themes/dva_halloween/__d_va_overwatch/scene.pkg |