diff --git a/config/hosts/samhain/nixos.nix b/config/hosts/samhain/nixos.nix index babfe3c6..e8c89d2e 100644 --- a/config/hosts/samhain/nixos.nix +++ b/config/hosts/samhain/nixos.nix @@ -95,9 +95,11 @@ in home.persistence."/persist/home" = { allowOther = true; directories = [ + ".local/share/z" ".local/share/dino" ".local/share/weechat" ".local/share/Mumble" + ".local/share/direnv" ".config/Mumble" ".config/Element" ".password-store" @@ -110,6 +112,7 @@ in "shared" ]; files = [ + ".ssh/known_hosts" ".zsh_history" ]; }; @@ -131,6 +134,8 @@ in deploy.profile.hardware.acs-override = true; + users.users.kat.extraGroups = singleton "openrazer"; + hardware.openrazer = { enable = true; }; diff --git a/config/profiles/gui/default.nix b/config/profiles/gui/default.nix index 3612a257..fb223f04 100644 --- a/config/profiles/gui/default.nix +++ b/config/profiles/gui/default.nix @@ -5,6 +5,7 @@ ./fonts.nix ./sway.nix ./filesystems.nix + ./qt.nix ./gpg.nix ./xdg-portals.nix ./dns.nix diff --git a/config/profiles/gui/qt.nix b/config/profiles/gui/qt.nix new file mode 100644 index 00000000..ac55b874 --- /dev/null +++ b/config/profiles/gui/qt.nix @@ -0,0 +1,9 @@ +{ config, ... }: + +{ + qt5 = { + enable = true; + style = "adwaita-dark"; + platformTheme = "gnome"; + }; +} diff --git a/config/users/kat/gui/default.nix b/config/users/kat/gui/default.nix index b8370c6d..91172e42 100644 --- a/config/users/kat/gui/default.nix +++ b/config/users/kat/gui/default.nix @@ -1,5 +1,5 @@ { config, ... }: { - imports = [ ./firefox.nix ./firefox-tst.nix ./packages.nix ./gtk.nix ./foot.nix ./xdg.nix ./ranger.nix ./fonts.nix ]; + imports = [ ./firefox.nix ./firefox-tst.nix ./packages.nix ./gtk.nix ./foot.nix ./xdg.nix ./ranger.nix ./fonts.nix ./qt.nix ]; } diff --git a/config/users/kat/gui/firefox.nix b/config/users/kat/gui/firefox.nix index 7f425467..c496169e 100644 --- a/config/users/kat/gui/firefox.nix +++ b/config/users/kat/gui/firefox.nix @@ -33,7 +33,6 @@ in sponsorblock floccus link-cleaner - octotree betterttv canvasblocker view-image diff --git a/config/users/kat/gui/qt.nix b/config/users/kat/gui/qt.nix new file mode 100644 index 00000000..149721b8 --- /dev/null +++ b/config/users/kat/gui/qt.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: + +{ + qt = { + enable = true; + platformTheme = "gtk"; + style = { + name = "adwaita-dark"; + package = pkgs.adwaita-qt; + }; + }; +} diff --git a/nix/sources.json b/nix/sources.json index 69bf6567..ce0b2d0b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,4 +1,16 @@ { + "anicca": { + "branch": "main", + "description": "A helper for transitioning to impermanence", + "homepage": "", + "owner": "kittywitch", + "repo": "anicca", + "rev": "d4ef7f09558ce9f80e198ebe364d60d05eea97f9", + "sha256": "05sciibf2ylmlj34rqb2cyr6djwh6q7caqi0ahrkypmzgcnch2v4", + "type": "tarball", + "url": "https://github.com/kittywitch/anicca/archive/d4ef7f09558ce9f80e198ebe364d60d05eea97f9.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "arcexprs": { "branch": "master", "description": "nix stuff", diff --git a/overlays/default.nix b/overlays/default.nix index 419f6738..000ceefb 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,6 +6,7 @@ let nurpkgs = self; pkgs = self; }; + anicca = self.callPackage sources.anicca {}; rustfmt = super.rustfmt.overrideAttrs ({ patches ? [ ], ... }: { patches = patches ++ [ # Adds an option variant that merges all use statements into a single block.