diff options
| -rw-r--r-- | flake.lock | 132 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | hosts/sofue/configuration.nix | 12 | ||||
| -rw-r--r-- | hosts/yashinoki/configuration.nix | 2 | ||||
| -rw-r--r-- | nix/programs/firefox.nix | 4 | ||||
| -rw-r--r-- | themes/miia_new_years_2025/miia.nix | 23 | ||||
| -rw-r--r-- | themes/miia_new_years_2025/splash.kra | bin | 0 -> 1383235 bytes | |||
| -rw-r--r-- | themes/miia_new_years_2025/splash.png | bin | 0 -> 501951 bytes | |||
| -rw-r--r-- | themes/miia_new_years_2025/wallpaper.kra | bin | 0 -> 6287436 bytes | |||
| -rw-r--r-- | themes/miia_new_years_2025/wallpaper.png | bin | 0 -> 1818069 bytes |
10 files changed, 94 insertions, 86 deletions
@@ -2,7 +2,9 @@ "nodes": { "camu": { "inputs": { - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": [ @@ -10,11 +12,11 @@ ] }, "locked": { - "lastModified": 1735767567, - "narHash": "sha256-CHY0LEB8K/+7j9xdGqd2KZ5+GXAgKIxrIVTvG+4+ZnE=", + "lastModified": 1736128078, + "narHash": "sha256-4pygh2I4GcLvy/SPyHldgp1rzhx/GxS+YiSE0AC57Ic=", "ref": "refs/heads/master", - "rev": "298debac881c1e7ca5e3a28834f32ff3e74e45f6", - "revCount": 75, + "rev": "d1f1eb9b3713a450c0736caad17febae0721af4d", + "revCount": 80, "type": "git", "url": "https://git.akon.city/camu" }, @@ -26,18 +28,18 @@ "chaotic": { "inputs": { "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "jovian": "jovian", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1735566338, - "narHash": "sha256-9sYGJZCGeb11WBVsE2u0gwuTk8LpbOgnrJvyDbHpOoY=", + "lastModified": 1736112920, + "narHash": "sha256-MME0HoMWJtk67vW4lop1eTK4//EXJB/hefo6+JbdHZs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "446ad45313df3dbc93ad9e9d8dd6d094b16f6fb4", + "rev": "aa7b9944e164d9284939b78d05b8cf8df319a5d5", "type": "github" }, "original": { @@ -87,11 +89,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -191,38 +193,16 @@ "home-manager": { "inputs": { "nixpkgs": [ - "camu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "lastModified": 1736066484, + "narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", "type": "github" }, "original": { @@ -231,18 +211,18 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1735745492, - "narHash": "sha256-Vs2IkQx4uDv2YehZ1sCw9K+kuMrBa3opnkGJJhMPNPo=", + "lastModified": 1736204492, + "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a9fef316ad191b3086edda465e850af282de4e0", + "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a", "type": "github" }, "original": { @@ -260,11 +240,11 @@ ] }, "locked": { - "lastModified": 1735330405, - "narHash": "sha256-MhXgu1oymyjhhZGY9yewNonJknNAjilzMGPY1FfMR7s=", + "lastModified": 1735931035, + "narHash": "sha256-f3WRxasPYVKzrvAlLq+/3FRHQVfxVf5xxf0WWwnO99k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a86d9cf841eff8b33a05d2bf25788abd8e018dbd", + "rev": "7e530766a5fd9b7577296fedd655f3255f7495d8", "type": "github" }, "original": { @@ -279,11 +259,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1734869532, - "narHash": "sha256-tMWJ1gDqNkCaH6jmZRXAUUhfhIrLMWJBiM+CtAtQqoY=", + "lastModified": 1736079376, + "narHash": "sha256-DE/PZoasUoex2Y/y2MnHklCXzGoVlHyMLXB56DHl7fY=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "1451a8a6902c85c90dae3c253df5401b7eb3581f", + "rev": "ef3ee8050d86486c0f380ddd479370ad33cf83fb", "type": "github" }, "original": { @@ -321,11 +301,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733909753, - "narHash": "sha256-5GChR6LKh6EwGXLfR3HLW2Z0AWoyce4Hyp3VB5C4FCk=", + "lastModified": 1736194844, + "narHash": "sha256-CXtD5xUKb92EjL9RrsGQ9jgnl0aIoGEPwnJ805d3Xz0=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "b1f94fed4af8e7f30665a3bf8b369dc3b8a95884", + "rev": "cbae9154bc76c5aa7873f0a67b3c9f13124929d3", "type": "github" }, "original": { @@ -417,11 +397,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736237814, + "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", "type": "github" }, "original": { @@ -470,11 +450,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1734829460, - "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", + "lastModified": 1736039079, + "narHash": "sha256-ONaTdkME8AJMoQjkydnlUNrzQrIWIdeprkRKW0V1UIE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", + "rev": "e506b7786d099e0dec40e1204c555e3562ee9bf8", "type": "github" }, "original": { @@ -493,11 +473,11 @@ ] }, "locked": { - "lastModified": 1734896070, - "narHash": "sha256-HECsyS551+KtffczDgx7w/xvruXHKoUf4JX7xW+Ecbo=", + "lastModified": 1736274403, + "narHash": "sha256-gOd1twminF/G/kX3zRmxXL39+0bF6BaVapOdvf8K8oY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "8988b0603fed7e3d303718328cf4cd8dd137575e", + "rev": "8411b42979359adfbcc78b2a3daadfb1c661817e", "type": "github" }, "original": { @@ -508,11 +488,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -524,11 +504,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "lastModified": 1736042175, + "narHash": "sha256-jdd5UWtLVrNEW8K6u5sy5upNAFmF3S4Y+OIeToqJ1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "bf689c40d035239a489de5997a4da5352434632e", "type": "github" }, "original": { @@ -547,11 +527,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1735765720, - "narHash": "sha256-RbiMI6dFCsLzF6lo47Z+AtHDz3V0pP9enfoJZ7Qe+5s=", + "lastModified": 1736268958, + "narHash": "sha256-O3cfbKgDb8A5VsUN0fPVpNf2EEFO5itnbkTYP+Vsuto=", "owner": "nix-community", "repo": "NUR", - "rev": "8ca3ecacbdf3ee00fb6e068b8519a4c8491a814b", + "rev": "706045eb80f347d5418e81c5aa80d6c410394991", "type": "github" }, "original": { @@ -564,7 +544,7 @@ "inputs": { "camu": "camu", "chaotic": "chaotic", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "mauri": "mauri", "nix-github-actions": "nix-github-actions_2", "nixos-hardware": "nixos-hardware_2", @@ -628,11 +608,11 @@ ] }, "locked": { - "lastModified": 1723303070, - "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { @@ -670,11 +650,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1735507919, - "narHash": "sha256-4cR4mk1660p3y8wnX0XbHSQh4KX0mbMn6/2YnALNt8o=", + "lastModified": 1736271378, + "narHash": "sha256-j1TqXcffjqp/xmWvY9j4Johj1AdKiGXv94pNZHXEz6Y=", "ref": "refs/heads/main", - "rev": "59a82ea8cd284c7535bc06b8f6156abb7da96f6a", - "revCount": 874, + "rev": "f423d6683cac7037333fbf38db8d0cc94c984fda", + "revCount": 880, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -33,6 +33,7 @@ camu = { url = "git+https://git.akon.city/camu"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; mauri = { url = "git+https://git.akon.city/mauri"; @@ -170,6 +171,12 @@ }); }) (self: super: { + python = super.python.override ({ + packageOverrides = (python-self: python-super: { + }); + }); + }) + (self: super: { vimPlugins = super.vimPlugins.extend (final: prev: { mini-nvim = prev.mini-nvim.overrideAttrs (old: { patches = [ diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix index 7c7ecc7..a9ea990 100644 --- a/hosts/sofue/configuration.nix +++ b/hosts/sofue/configuration.nix @@ -44,13 +44,13 @@ in rec { size = ui-font.size; baseline = 0; }; - scheme = import ../../themes/shipgirl_christmas/shipgirl_christmas.nix; + scheme = import ../../themes/miia_new_years_2025/miia.nix; starter = { - picture = ../../themes/shipgirl_christmas/splash.png; - width = 41; + picture = ../../themes/miia_new_years_2025/splash.png; + width = 50; padding = { - top = -4; - left = -4; + top = -5; + left = -11; text = 0; }; position = "left"; @@ -218,7 +218,7 @@ in rec { "${mod4}+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 90"; "${mod4}+Shift+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 0"; "${mod4}+F1" = "exec swaymsg -- output ${s.monitors.monitor1} bg \\#${s.scheme.background-alt} solid_color"; - "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/shipgirl_christmas/wallpaper.png} fill"; + "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/miia_new_years_2025/wallpaper.png} fill"; #"${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection"; #"${mod4}+F2" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection"; "Pause" = "exec $HOME/c/camu/scripts/cmv_add.sh PAUSE"; diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix index c7a30b0..d2606e4 100644 --- a/hosts/yashinoki/configuration.nix +++ b/hosts/yashinoki/configuration.nix @@ -44,9 +44,7 @@ in { starter = { picture = ../../themes/zelda_summer/splash_alt.png; width = 38; - #width = 40; padding = { top = -1; left = -9; text = 0; }; - #padding = { top = -6; left = 0; text = 0; }; position = "left"; footer = "Thinking about the next power move.\\n - Soulja Boy, 2014"; footer_offset = 1; diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix index f0f6e22..07da144 100644 --- a/nix/programs/firefox.nix +++ b/nix/programs/firefox.nix @@ -19,8 +19,8 @@ in { source = (pkgs.fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; - rev = "6cbc3b6eceb4195edab67daecc8daa7347c84c27"; - hash = "sha256-8yoUFYBtD86J2ddq1yMU0oCILp9u35/dmYi9iwiysi8="; + rev = "a5029a0797d9ab4d5a20f223cacddd70e3748dc8"; + hash = "sha256-mRE/foGagh2XarMerOXtgldpxiCb/dQa7tHOpPpP2Zw="; }); }; home.file."customChrome.css" = { diff --git a/themes/miia_new_years_2025/miia.nix b/themes/miia_new_years_2025/miia.nix new file mode 100644 index 0000000..e70e88a --- /dev/null +++ b/themes/miia_new_years_2025/miia.nix @@ -0,0 +1,23 @@ +rec { + lightness = "dark"; + background = "1f2b5c"; #1f2b5c + background-alt = "222f64"; #222f64 + foreground = "eff2ff"; #eff2ff + color0 = "${background}"; + color1 = "ba5b5a"; #ba5b5a + color2 = "a76882"; #a76882 + color3 = "ecd37e"; #ecd37e + color4 = "85b0cf"; #85b0cf + color5 = "8d4355"; #8d4355 + color6 = "e3b1a1"; #e3b1a1 + color7 = "${foreground}"; + color8 = "${color6}"; + color9 = "${color1}"; + color10 = "${color2}"; + color11 = "${color3}"; + color12 = "${color4}"; + color13 = "${color5}"; + color14 = "${color6}"; + color15 = "${color7}"; + alpha = 0.875; +} diff --git a/themes/miia_new_years_2025/splash.kra b/themes/miia_new_years_2025/splash.kra Binary files differnew file mode 100644 index 0000000..691b8ea --- /dev/null +++ b/themes/miia_new_years_2025/splash.kra diff --git a/themes/miia_new_years_2025/splash.png b/themes/miia_new_years_2025/splash.png Binary files differnew file mode 100644 index 0000000..d0b1ab3 --- /dev/null +++ b/themes/miia_new_years_2025/splash.png diff --git a/themes/miia_new_years_2025/wallpaper.kra b/themes/miia_new_years_2025/wallpaper.kra Binary files differnew file mode 100644 index 0000000..3d158bb --- /dev/null +++ b/themes/miia_new_years_2025/wallpaper.kra diff --git a/themes/miia_new_years_2025/wallpaper.png b/themes/miia_new_years_2025/wallpaper.png Binary files differnew file mode 100644 index 0000000..28af8ac --- /dev/null +++ b/themes/miia_new_years_2025/wallpaper.png |