diff --git a/ginoza/configuration.nix b/ginoza/configuration.nix index 34d809b..fa0e982 100644 --- a/ginoza/configuration.nix +++ b/ginoza/configuration.nix @@ -76,7 +76,7 @@ }; # Basic programs to enable - programs.kdeconnect.enable = true; + programs.kdeconnect.enable = false; programs.wireshark.enable = false; # Allow unfree packages diff --git a/ginoza/hardware-configuration.nix b/ginoza/hardware-configuration.nix index 5407393..f9dc1b3 100644 --- a/ginoza/hardware-configuration.nix +++ b/ginoza/hardware-configuration.nix @@ -8,23 +8,25 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "sdhci_acpi" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/87a2dbee-93c5-4316-811c-90a15f60fdca"; + { device = "/dev/disk/by-uuid/3dda4634-36a6-432a-b03e-00e6543a99f2"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/9BCE-737B"; + { device = "/dev/disk/by-uuid/E487-4436"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/04c27abd-36f9-43c0-ab81-1fa1a7c1c58c"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/ginoza/home.nix b/ginoza/home.nix index 73ec3ac..c4f83d6 100644 --- a/ginoza/home.nix +++ b/ginoza/home.nix @@ -67,6 +67,7 @@ gimp mpv loupe + bluefish ]) ++ ( with pkgs; [harmony-music] diff --git a/nixos/home/desktop/gnome/gnome.nix b/nixos/home/desktop/gnome/gnome.nix index 5362bf7..3442e71 100644 --- a/nixos/home/desktop/gnome/gnome.nix +++ b/nixos/home/desktop/gnome/gnome.nix @@ -19,14 +19,21 @@ dconf = { enable = true; - settings."org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = with pkgs.gnomeExtensions; [ - blur-my-shell.extensionUuid - gsconnect.extensionUuid - appindicator.extensionUuid - privacy-settings-menu.extensionUuid - ]; + settings = { + "org/gnome/desktop/peripherals/touchpad" = { + click-method = true; + natural-scroll = true; + two-finger-scrolling-enabled = true; + }; + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = with pkgs.gnomeExtensions; [ + blur-my-shell.extensionUuid + gsconnect.extensionUuid + appindicator.extensionUuid + privacy-settings-menu.extensionUuid + ]; + }; }; }; }; diff --git a/nixos/system/settings/style.nix b/nixos/system/settings/style.nix index 7fd0abb..4ff73b9 100644 --- a/nixos/system/settings/style.nix +++ b/nixos/system/settings/style.nix @@ -17,22 +17,22 @@ base16Scheme = if userSettings.theme == "catppuccin-mocha" then { - base00 = "#1e1e2e"; - base01 = "#181825"; # mantle - base02 = "#313244"; # surface0 - base03 = "#45475a"; # surface1 - base04 = "#585b70"; # surface2 - base05 = "#cdd6f4"; # text - base06 = "#f5e0dc"; # rosewater - base07 = "#b4befe"; # lavender - base08 = "#f38ba8"; # red - base09 = "#fab387"; # peach - base0A = "#f9e2af"; # yellow - base0B = "#a6e3a1"; # green - base0C = "#94e2d5"; # teal - base0D = "#89b4fa"; # blue - base0E = "#cba6f7"; # mauve - base0F = "#f2cdcd"; # flamingo + base00 = "1e1e2e"; + base01 = "181825"; # mantle + base02 = "313244"; # surface0 + base03 = "45475a"; # surface1 + base04 = "585b70"; # surface2 + base05 = "cdd6f4"; # text + base06 = "f5e0dc"; # rosewater + base07 = "b4befe"; # lavender + base08 = "f38ba8"; # red + base09 = "fab387"; # peach + base0A = "f9e2af"; # yellow + base0B = "a6e3a1"; # green + base0C = "94e2d5"; # teal + base0D = "89b4fa"; # blue + base0E = "cba6f7"; # mauve + base0F = "f2cdcd"; # flamingo } else if userSettings.theme == "evangelion-blood" then # List all possible themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes