diff --git a/flake.lock b/flake.lock index 639c072..785f9cf 100644 --- a/flake.lock +++ b/flake.lock @@ -80,6 +80,18 @@ "url": "https://git.gaze.systems/dusk/website.git" } }, + "catppuccin-discord": { + "flake": false, + "locked": { + "narHash": "sha256-cOf1czMIKlTt0XLeZAw0Z398Pa8h2d90IPPT43+gjoI=", + "type": "file", + "url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css" + }, + "original": { + "type": "file", + "url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css" + } + }, "crane": { "flake": false, "locked": { @@ -313,11 +325,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1667044926, - "narHash": "sha256-VJx7GKkVmXCxsDfOXEDXGrAHZWyHN74Ax6GUXiir0Z8=", + "lastModified": 1669643151, + "narHash": "sha256-39/l57QusriyNr426kXNqtub0ciZna+t20VKPYUAgsM=", "owner": "elkowar", "repo": "eww", - "rev": "7a0e1b77f24ee89d627e552f9abc55eb636aaaa6", + "rev": "ec4c2d1a4f12e9c3664e9f53ad99007b4a10a16a", "type": "github" }, "original": { @@ -459,11 +471,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1669495243, - "narHash": "sha256-ap787IQRUsFNnLconu9SDumtPxbczjVKv5E8Z9YKBD4=", + "lastModified": 1670292968, + "narHash": "sha256-s0W84bCJKT0zqLEuT9HfJJRnoJhsvRoXjVPt5zmzDn8=", "owner": "helix-editor", "repo": "helix", - "rev": "f0f295a6679655dccfab0c1e0e9bb4a87e351db5", + "rev": "453a75a3739338348024b6c676231aef9ef6cb7b", "type": "github" }, "original": { @@ -480,11 +492,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1669328018, - "narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", + "lastModified": 1670280307, + "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", "owner": "nix-community", "repo": "home-manager", - "rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", + "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", "type": "github" }, "original": { @@ -496,17 +508,19 @@ }, "hyprland": { "inputs": { + "hyprland-protocols": "hyprland-protocols", "nixpkgs": [ "nixpkgs" ], - "wlroots": "wlroots" + "wlroots": "wlroots", + "xdph": "xdph" }, "locked": { - "lastModified": 1669496178, - "narHash": "sha256-OVVqfsCr5+mtnuLoGs17Gikti91Pv7VE6kYNFk1exe8=", + "lastModified": 1670267535, + "narHash": "sha256-The+YCkkQ0dYXJWECktItiki7l8ImTsP2u1DKXkTzk0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9247f88d0c9905dec186ea607bee0cf6c00fdb44", + "rev": "da76a1ed9eab3d1b5cf5fae4d040f8efe08b586c", "type": "github" }, "original": { @@ -535,6 +549,38 @@ "type": "github" } }, + "hyprland-protocols": { + "flake": false, + "locked": { + "lastModified": 1670258048, + "narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { + "flake": false, + "locked": { + "lastModified": 1670185345, + "narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4623a404c091e64743ba310199bb380ec52f1936", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "nci": { "inputs": { "devshell": "devshell", @@ -595,11 +641,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1669391194, - "narHash": "sha256-4oWcXqyBYPHF+Wt8AxRhWk70O1qVJPkyBw2IhxJtj6k=", + "lastModified": 1670273694, + "narHash": "sha256-Rb+AIMyncKNnP0EahDg5w37v6TXlGtd2SczugSQzMQU=", "owner": "oxalica", "repo": "nil", - "rev": "afec5fed829ee193de7e8c62e1fb4bd55140f4ac", + "rev": "101387fb2f54ebc67c894979d1ae0efac2b4ad5c", "type": "github" }, "original": { @@ -614,11 +660,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1669296560, - "narHash": "sha256-W7Hqq1gWlPO54M79+olt+cl2wodq8/B9K9gDHXl99jc=", + "lastModified": 1670210028, + "narHash": "sha256-2VpxobYICB+l6n963nR37r0ongTtvHfHQvsPGgMWDmw=", "owner": "Misterio77", "repo": "nix-colors", - "rev": "01c5aea7d6724723f3deca4dfde6d916b7bdbe50", + "rev": "fcd345bd1c9e7c203c3320ee6ca39814c97ac1fe", "type": "github" }, "original": { @@ -649,11 +695,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1669146234, - "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", + "lastModified": 1670174919, + "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", + "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", "type": "github" }, "original": { @@ -711,11 +757,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1669345789, - "narHash": "sha256-bgPNYOreLhmAj3GasmFmKyZmlpWIUuk29K9Ef3T+xFA=", + "lastModified": 1670205845, + "narHash": "sha256-hOkPA1NxTt68ClZeJF/42tGklqeeMAYuMHR+PXt9xHw=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "fe0de01500c36062c4db7db02e25a82be275a402", + "rev": "7a42bdbb71bed152dc0fccb696b988985ecb412f", "type": "github" }, "original": { @@ -758,11 +804,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1669411043, - "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "lastModified": 1670064435, + "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", + "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "type": "github" }, "original": { @@ -774,11 +820,11 @@ }, "nur": { "locked": { - "lastModified": 1669471448, - "narHash": "sha256-jG75clzKUQI+foiRxAWK8+2f58NS8Tf7fvQncOIfUuI=", + "lastModified": 1670315682, + "narHash": "sha256-/v0RgZZIjvsFuJbJLUlzRbzSlYFXq3olgJTuJBNtcoY=", "owner": "nix-community", "repo": "NUR", - "rev": "81badd317a42472752389870baa37827b495a6d9", + "rev": "af814db16c89385c65e758608296440555f61ccc", "type": "github" }, "original": { @@ -791,6 +837,7 @@ "inputs": { "bernbot": "bernbot", "blog": "blog", + "catppuccin-discord": "catppuccin-discord", "eww": "eww", "helix": "helix", "home": "home", @@ -878,11 +925,11 @@ ] }, "locked": { - "lastModified": 1669170936, - "narHash": "sha256-TKPH4Pzkjw5gAPo9hejs3O4mWJW6V/RSiOj8UuSFRTs=", + "lastModified": 1669775522, + "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c90c223c4aef334356029b89c72bb65e26f7efe6", + "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", "type": "github" }, "original": { @@ -927,11 +974,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1668785720, - "narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=", + "lastModified": 1669925104, + "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", "owner": "wlroots", "repo": "wlroots", - "rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7", + "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", "type": "gitlab" }, "original": { @@ -940,6 +987,28 @@ "repo": "wlroots", "type": "gitlab" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670202338, + "narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "af840a9e0947a79a37a95a9f62062653721e43fa", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 24d69a6..3dbc6ce 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,8 @@ eww.inputs.nixpkgs.follows = "nixpkgs"; nix-colors.url = "github:Misterio77/nix-colors"; + catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"; + catppuccin-discord.flake = false; }; outputs = inputs: let diff --git a/modules/cachix/iohk.nix b/modules/cachix/iohk.nix deleted file mode 100644 index 7fe57c5..0000000 --- a/modules/cachix/iohk.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - nix.settings = { - trusted-public-keys = ["hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="]; - substituters = ["https://hydra.iohk.io"]; - }; -} diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 96cbca1..5bceba1 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -4,12 +4,7 @@ pkgs, lib, ... -}: let - theme = pkgs.fetchurl { - url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"; - hash = "sha256-LCjw3k2NuPKGwAEvPUnJeQk9zQQ+TyHpZ/eNrETkWSM="; - }; -in { +}: { home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ ".config/discordcanary" ]; @@ -18,7 +13,7 @@ in { setup = true; noTyping = true; quickstart = true; - theme = builtins.readFile theme; + theme = builtins.readFile inputs.catppuccin-discord; }; SKIP_HOST_UPDATE = true; IS_MAXIMIZED = true; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index efaaef0..23ef537 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -50,7 +50,7 @@ in { # this is needed for impermanence fuse.userAllowOther = true; adb.enable = true; - steam.enable = true; + # steam.enable = true; # gnome stuffs seahorse.enable = true; dconf.enable = true;