nix: enable breeze-gtk and other things
Anirudh Oppiliappan x@icyphox.sh
Thu, 15 Dec 2022 08:53:52 +0530
6 files changed,
81 insertions(+),
69 deletions(-)
M
nix/flake.lock
→
nix/flake.lock
@@ -7,11 +7,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1667419884, - "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=", + "lastModified": 1671020882, + "narHash": "sha256-nilsez0cjzvWUZzcWI+ZK3gY/wT3RvkQA9qw8GYJmEU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100", + "rev": "2795e05cca69bddad989186888175548f4fca33d", "type": "github" }, "original": {@@ -46,11 +46,11 @@ },
"flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": {@@ -61,11 +61,11 @@ }
}, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": {@@ -78,19 +78,20 @@ "home-manager": {
"inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1670253003, + "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" }@@ -102,15 +103,15 @@ "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1668326976, - "narHash": "sha256-7U1v7tmGPdzsY0jCVwV7GgUsOlnHvEpD6myyiABCaYs=", - "owner": "icyphox", + "lastModified": 1671005716, + "narHash": "sha256-3qXlr9545AtmLjGDubPiKnMAuIfyj2jghxNy/ZX23X0=", + "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e8487c9b0a3edc3c5d49ab42800dc8b2b8302c99", + "rev": "d7b3a6b39d73c5812a9cf8b74454b15b205bf75a", "type": "github" }, "original": { - "owner": "icyphox", + "owner": "nix-community", "repo": "neovim-nightly-overlay", "type": "github" }@@ -125,11 +126,11 @@ ]
}, "locked": { "dir": "contrib", - "lastModified": 1668299715, - "narHash": "sha256-k9YBKTMfNfCj7mwUYOS3ltGQM2Nd1OFJrwS6iXr2lo8=", + "lastModified": 1670942634, + "narHash": "sha256-d/K7M1InZQy6ea0GgiuUnPmNQgBlKPPDVlZTC9umHFI=", "owner": "neovim", "repo": "neovim", - "rev": "9d7dc5062877bd7e035f1f7a74e2462c2e942864", + "rev": "090048bec9f80c46a6ce6ff05a419b15bc4bf028", "type": "github" }, "original": {@@ -141,11 +142,11 @@ }
}, "nixos-hardware": { "locked": { - "lastModified": 1668334946, - "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", + "lastModified": 1670959777, + "narHash": "sha256-9nQJWL7S77YZERxairPLFO6TUuF1RgQmdZO6dKRCHz4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", + "rev": "0fbf27af51a7c9bc68a168fdcd63513c4f100b15", "type": "github" }, "original": {@@ -156,27 +157,27 @@ }
}, "nixpkgs": { "locked": { - "lastModified": 1668087632, - "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=", + "lastModified": 1670918062, + "narHash": "sha256-iOhkyBYUU9Jfkk0lvI4ahpjyrTsLXj9uyJWwmjKg+gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f", + "rev": "84575b0bd882be979516f4fecfe4d7c8de8f6a92", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1668087632, - "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=", + "lastModified": 1670929434, + "narHash": "sha256-n5UBO6XBV4h3TB7FYu2yAuNQMEYOrQyKeODUwKe06ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f", + "rev": "1710ed1f6f8ceb75cf7d1cf55ee0cc21760e1c7a", "type": "github" }, "original": {@@ -231,6 +232,21 @@ "original": {
"owner": "rust-analyzer", "ref": "nightly", "repo": "rust-analyzer", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }
M
nix/flake.nix
→
nix/flake.nix
@@ -7,11 +7,11 @@
nixos-hardware.url = "github:nixos/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - neovim.url = "github:icyphox/neovim-nightly-overlay"; + neovim.url = "github:nix-community/neovim-nightly-overlay"; darwin = { url = "github:lnl7/nix-darwin/master";
M
nix/home.nix
→
nix/home.nix
@@ -14,7 +14,7 @@ ];
fonts.fontconfig.enable = true; - home.stateVersion = "master"; + home.stateVersion = "22.11"; home.username = "icy"; home.homeDirectory = "/home/icy"; home.extraOutputsToInstall = [ "man" ];@@ -24,7 +24,6 @@ git
unzip curl tmux - weechat ripgrep imagemagick ffmpeg@@ -36,7 +35,6 @@ noto-fonts-emoji
jq yq-go fzy - kubectl slack nixpkgs-fmt libnotify@@ -45,11 +43,25 @@ calibre
pinentry kontact korganizer - kmail libreoffice-qt akonadi + go + evolution + dconf - ] ++ (import ./bin { inherit pkgs host; }); + ]; # ++ (import ./bin { inherit pkgs host; }); + + gtk = { + enable = true; + iconTheme = { + package = pkgs.breeze-icons; + name = "Breeze"; + }; + theme = { + package = pkgs.breeze-gtk; + name = "Breeze"; + }; + }; xdg = { userDirs = {
M
nix/hosts/wyndle/configuration.nix
→
nix/hosts/wyndle/configuration.nix
@@ -1,35 +1,21 @@
-let - asusctl-tar = fetchTarball "https://github.com/NixOS/nixpkgs/archive/a4a81b6f6c27e5a964faea25b7b5cbe611f98691.tar.gz"; -in { self, config, pkgs, lib, ... }: { imports = [ ./hardware-configuration.nix - "${asusctl-tar}/nixos/modules/services/misc/asusctl.nix" - "${asusctl-tar}/nixos/modules/services/misc/supergfxctl.nix" ]; boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; kernel.sysctl."net.ipv4.ip_forward" = 1; - kernelParams = [ "mem_sleep_default=deep" ]; - kernelPatches = [{ - name = "three-hundred-hertz"; - patch = null; - extraConfig = '' - HZ_300 y - HZ 300 - ''; - }]; resumeDevice = "/dev/nvme0n1p2"; kernelPackages = pkgs.linuxPackages_latest; }; networking = { - nameservers = [ "1.1.1.1" "1.0.0.1" ]; + nameservers = [ "8.8.8.8" "8.8.4.4" ]; wireless = { enable = true; interfaces = [ "wlp6s0" ];@@ -77,29 +63,25 @@ firefox.enablePlasmaBrowserIntegration = true;
}; nixpkgs.overlays = with self.overlays; [ - (self: super: { - asusctl = pkgs.callPackage "${asusctl-tar}/pkgs/tools/misc/asusctl/default.nix" { }; - supergfxctl = pkgs.callPackage "${asusctl-tar}/pkgs/tools/misc/supergfxctl/default.nix" { }; - }) nvim-nightly prompt ]; environment = { + sessionVariables = rec { + NIXOS_OZONE_WL = "1"; + }; + variables = { + MOZ_USE_XINPUT2 = "1"; + GDK_SCALE = "2"; + GDK_DPI_SCALE = "0.5"; + }; systemPackages = with pkgs; [ - asusctl - supergfxctl - cwm man-pages git man-pages-posix (lib.hiPrio pkgs.bashInteractive_5) ]; - variables = { - MOZ_USE_XINPUT2 = "1"; - GDK_SCALE = "2"; - GDK_DPI_SCALE = "0.5"; - }; etc = { "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' bluez_monitor.properties = {@@ -149,8 +131,6 @@ };
}; services = { - asusctl.enable = true; - supergfxctl.enable = true; pipewire = { enable = true; alsa.enable = true;
M
nix/programs/firefox.nix
→
nix/programs/firefox.nix
@@ -9,7 +9,6 @@ {
programs.firefox = { enable = true; package = pkgs.wrapFirefox pkgs.firefox-unwrapped { - forceWayland = true; extraPolicies = { ExtensionSettings = { }; };@@ -22,6 +21,8 @@ userChrome = ''
#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header { display: none; } + + #sidebar-header{ display: none } #main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar > .toolbar-items { opacity: 0;
M
nix/programs/neovim.nix
→
nix/programs/neovim.nix
@@ -16,6 +16,9 @@ nixpkgs-fmt
gotools gopls go + cargo + rust-analyzer + rustc nodePackages.vscode-langservers-extracted nodePackages.typescript-language-server nodePackages.typescript