diff --git a/flake.lock b/flake.lock index f270147..e5683c2 100644 --- a/flake.lock +++ b/flake.lock @@ -16,16 +16,32 @@ "type": "gitlab" } }, + "candy-icons": { + "flake": false, + "locked": { + "lastModified": 1717103572, + "narHash": "sha256-LdPoPUxE2v7u6oE8ZrjJWbwGkm1JlmjGKbYDAoU1UGk=", + "ref": "refs/heads/master", + "rev": "ddafbbcae3f0c88ae6f139eaa2f0a7ca278f9395", + "revCount": 1182, + "type": "git", + "url": "https://github.com/EliverLara/candy-icons" + }, + "original": { + "type": "git", + "url": "https://github.com/EliverLara/candy-icons" + } + }, "disko": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1717915259, - "narHash": "sha256-VsGPboaleIlPELHY5cNTrXK4jHVmgUra8uC6h7KVC5c=", + "lastModified": 1718008439, + "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", "owner": "nix-community", "repo": "disko", - "rev": "1bbdb06f14e2621290b250e631cf3d8948e4d19b", + "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", "type": "github" }, "original": { @@ -70,11 +86,11 @@ }, "hardware": { "locked": { - "lastModified": 1717828156, - "narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=", + "lastModified": 1717995329, + "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "057a7996d012f342a38a26261ee529cebb1755ef", + "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "type": "github" }, "original": { @@ -107,11 +123,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1717685136, - "narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=", + "lastModified": 1718081048, + "narHash": "sha256-dwKvamucNK8gB6RTTfnBeBbBgjARQgHQph8PdHZoL3s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52", + "rev": "f27db3a9a8c21a65c1ef50cacca3ef2bfff04cb9", "type": "github" }, "original": { @@ -125,14 +141,15 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_4", + "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" }, "locked": { - "lastModified": 1717515088, - "narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=", + "lastModified": 1718084203, + "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456", + "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", "type": "gitlab" }, "original": { @@ -143,25 +160,29 @@ }, "nix-custom": { "inputs": { + "candy-icons": "candy-icons", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_5", + "sweet-ambar-blue": "sweet-ambar-blue", + "sweet-ambar-blue-dark": "sweet-ambar-blue-dark", + "sweet-folders": "sweet-folders", "wallpaper-engine-plasma5-plugin": "wallpaper-engine-plasma5-plugin", "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin", "yorha-grub-theme": "yorha-grub-theme", "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1711247107, - "narHash": "sha256-OlYhh7sHJGbyEH8imtyKqCHAxVVq27+hPvTzLmx7LSY=", + "lastModified": 1718089908, + "narHash": "sha256-iHW4QQvY8Bl5lUfPa3w6N2U8RFxc1O7bM26msjg3WFQ=", "ref": "refs/heads/main", - "rev": "6e0d3eb6a053ef1d8069acc1a89a35a1bea2ab30", - "revCount": 14, + "rev": "12ce7dd148f6ee4ab5297b55563e1dee5470eb38", + "revCount": 15, "type": "git", - "url": "https://forgejo.invariantspace.com/macronova/nix-custom" + "url": "file:///home/macronova/Desktop/nix-custom" }, "original": { "type": "git", - "url": "https://forgejo.invariantspace.com/macronova/nix-custom" + "url": "file:///home/macronova/Desktop/nix-custom" } }, "nix-github-actions": { @@ -188,11 +209,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717459389, - "narHash": "sha256-I8/plBsua4/NZ5bKgj+z7/ThiWuud1YFwLsn1QQ5PgE=", + "lastModified": 1717868076, + "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b01abcc24846ae49957b30f4345bab4b3f1d14b", + "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", "type": "github" }, "original": { @@ -202,6 +223,21 @@ "type": "github" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1717880976, @@ -252,11 +288,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -267,11 +303,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -331,11 +367,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717902109, - "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", + "lastModified": 1718058322, + "narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f0922ad001829b400f0160ba85b47d252fa3d925", + "rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f", "type": "github" }, "original": { @@ -344,6 +380,56 @@ "type": "github" } }, + "sweet-ambar-blue": { + "flake": false, + "locked": { + "lastModified": 1718055658, + "narHash": "sha256-Yt0C3RTpyUH7HkI+Xr+smcU+k9nvAqUbDnd86Vgw7lE=", + "ref": "Ambar-Blue", + "rev": "1c790e61ee1c2530e706fbadafdea258d7985f59", + "revCount": 287, + "type": "git", + "url": "https://github.com/EliverLara/Sweet" + }, + "original": { + "ref": "Ambar-Blue", + "type": "git", + "url": "https://github.com/EliverLara/Sweet" + } + }, + "sweet-ambar-blue-dark": { + "flake": false, + "locked": { + "lastModified": 1718055672, + "narHash": "sha256-bB/SusRmrgXWYFyJrLymMCRqis/MyQ01sAZINtwu0dE=", + "ref": "Ambar-Blue-Dark", + "rev": "63f0cf094a1c2eb8c929c2ba766842dc8991f20f", + "revCount": 370, + "type": "git", + "url": "https://github.com/EliverLara/Sweet" + }, + "original": { + "ref": "Ambar-Blue-Dark", + "type": "git", + "url": "https://github.com/EliverLara/Sweet" + } + }, + "sweet-folders": { + "flake": false, + "locked": { + "lastModified": 1679179505, + "narHash": "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE=", + "ref": "refs/heads/master", + "rev": "b2192ff1412472f036fdf9778c6b9dbcb6c044ec", + "revCount": 14, + "type": "git", + "url": "https://github.com/EliverLara/Sweet-folders" + }, + "original": { + "type": "git", + "url": "https://github.com/EliverLara/Sweet-folders" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -454,11 +540,11 @@ "rev": "a1dad2f17c229ec9b98987614cce4de83eed73f9", "revCount": 3, "type": "git", - "url": "https://forgejo.invariantspace.com/macronova/yorha-sound-theme.git" + "url": "https://forgejo.invariantspace.com/macronova/yorha-sound-theme" }, "original": { "type": "git", - "url": "https://forgejo.invariantspace.com/macronova/yorha-sound-theme.git" + "url": "https://forgejo.invariantspace.com/macronova/yorha-sound-theme" } } }, diff --git a/flake.nix b/flake.nix index fabb2d8..f724970 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nix-custom.url = "git+https://forgejo.invariantspace.com/macronova/nix-custom"; + nix-custom.url = "/home/macronova/Desktop/nix-custom"; sops-nix.url = "github:Mic92/sops-nix"; }; diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 21b8752..b3db818 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -3,26 +3,23 @@ let usr = config.constants.userName; in { home-manager.users.${usr} = { config, pkgs, ... }: let xdgCfg = config.xdg; in { - gtk = { - enable = true; - gtk2.configLocation = "${xdgCfg.configHome}/gtk-2.0/gtkrc"; - theme = { - name = "Sweet-Dark"; - package = pkgs.sweet; - }; - }; home.packages = with pkgs; [ exactaudiocopy feishin haruna + hunspell + hunspellDicts.en-us-large jellyfin-mpv-shim joplin-desktop + libreoffice-qt6-fresh lutris nvtopPackages.amd picard qbittorrent razergenie ryujinx + sweet + sweet-ambar-blue telegram-desktop thunderbird wallpaper-engine-plasma6-plugin