From bc1b4cae030abb6fea1b63e71b813823564461ed Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sat, 13 Apr 2024 20:43:41 +0200 Subject: [PATCH] Sound working; Catppuccin cursors --- flake.lock | 36 ++++++++++++------------- home/default.nix | 2 +- home/modules/gtk.nix | 15 ++++++++++- home/modules/shell.nix | 2 +- hosts/aarch64-linux/alastor/default.nix | 7 ++--- 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 563f7be..31fad21 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1712635448, - "narHash": "sha256-asMWh6iBblIY0rfhRgMjNv5/q12lSFO0VUk8Hqr2fzQ=", + "lastModified": 1712894663, + "narHash": "sha256-aNvgxHiDCJ2dnkkpU8W5ufHb5KY2P8wupzovGiOijqY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5f3e523af6e16a49ff10d5f7f776e2dda534a735", + "rev": "9f5c9aad284a476a7b99e3f91a76e8e137605763", "type": "gitlab" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1712645849, - "narHash": "sha256-67v20E0gH7nvAaMsah2oRIocnxGO25fATUyzQHIywxQ=", + "lastModified": 1712759992, + "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "owner": "nix-community", "repo": "home-manager", - "rev": "40a99619da804a78a0b166e5c6911108c059c3a8", + "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712566108, - "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1712662562, - "narHash": "sha256-rlY2j5lNyOLbuYKT6zY3HlXfBM+w7qWhfOqCTHshPw0=", + "lastModified": 1712940319, + "narHash": "sha256-QN9FhrpcHQLfc6CJmgNOD2vXz9/aGTEqDYTWtdc/mi0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c81c2414155adffb06d68b894f791dc243ecf2ae", + "rev": "623ac957cb99a5647c9cf127ed6b5b9edfbba087", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712655539, - "narHash": "sha256-Wpr4lWndkYRgs27Yl5ALJQ7n4PdDjT+Mq+8xAz2q1CY=", + "lastModified": 1712926768, + "narHash": "sha256-NQhU4yhHPan0ojwN5nKg2+dJZrxqcv0UkUreQCW2Xjw=", "owner": "nix-community", "repo": "nixvim", - "rev": "512ac70ec96ee774867f5a6ae494b12f0d4ddcb9", + "rev": "38a4fc7709343eb6e15ebb483e141fd95be28122", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 8dbbf9d..aa18663 100644 --- a/home/default.nix +++ b/home/default.nix @@ -29,7 +29,7 @@ dconf.enable = true; - services.easyeffects = {enable = true;}; + services.easyeffects = lib.mkIf (pkgs.system == "x86_64-linux") {enable = true;}; home.stateVersion = "23.11"; diff --git a/home/modules/gtk.nix b/home/modules/gtk.nix index e39146a..ae71e09 100644 --- a/home/modules/gtk.nix +++ b/home/modules/gtk.nix @@ -7,7 +7,7 @@ dconf.settings = { "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; - cursor-theme = "Adwaita"; + cursor-theme = "Catppuccin-Mocha-Pink-Cursors"; }; "org/gnome/shell" = { disable-user-extensions = false; @@ -16,6 +16,8 @@ enabled-extensions = [ "user-theme@gnome-shell-extensions.gcampax.github.com" "trayIconsReloaded@selfmade.pl" + "burn-my-windows@schneegans.github.com" + "desktop-cube@schneegans.github.com" "Vitals@CoreCoding.com" "dash-to-panel@jderose9.github.com" # "blur-my-shell@aunetx" @@ -58,5 +60,16 @@ gnomeExtensions.dash-to-panel gnomeExtensions.sound-output-device-chooser gnomeExtensions.space-bar + gnomeExtensions.burn-my-windows + gnomeExtensions.desktop-cube + catppuccin-cursors.mochaPink ]; +# home.pointerCursor = { +# gtk.enable = true; +# x11.enable = true; +# name = "Catppuccin-Mocha-Pink-Cursors"; +# package = pkgs.catppuccin-cursors.mochaPink; +# # size = 24; +# }; + } diff --git a/home/modules/shell.nix b/home/modules/shell.nix index 9922189..d6846da 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -13,7 +13,7 @@ eza.enable = true; nushell = { enable = true; - shellAliases = {ls = "eza -l --icons --header --git --group-directories-first";}; + shellAliases = {ls = "eza -l --icons --tree --level 2 --header --git --group-directories-first";}; extraConfig = "maxfetch"; configFile = { text = builtins.readFile ../config-files/config.nu; diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix index 882ffc5..023bfe5 100644 --- a/hosts/aarch64-linux/alastor/default.nix +++ b/hosts/aarch64-linux/alastor/default.nix @@ -1,6 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). { config, lib, @@ -9,7 +6,6 @@ ... }: { imports = [ - # Include the results of the hardware scan. ./hardware-configuration.nix inputs.apple-silicon.nixosModules.apple-silicon-support ../../../common @@ -24,6 +20,7 @@ # only builds with `--impure` which SUCKS I HATE THIS RAAAH hardware.asahi.experimentalGPUInstallMode = "replace"; hardware.asahi.withRust = true; + hardware.asahi.setupAsahiSound = true; hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = lib.mkForce false; @@ -72,7 +69,7 @@ # Enable sound. sound.enable = true; # hardware.pulseaudio.enable = true; - # hardware.pulseaudio.enable = true; + # hardware.pulseaudio.enable = false; security.rtkit.enable = true; security.polkit.enable = true; # services.pipewire = {