From 34674dac68d23c194be94f44f343cf8d79f66627 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 1 Dec 2022 09:09:08 +0100 Subject: [PATCH] updates --- flake.lock | 60 ++++++++++---------- nixos/hosts/thalassa/aoife/configuration.nix | 6 +- nixos/hosts/thalassa/aoife/home/dconf.nix | 4 +- nixos/hosts/thalassa/aoife/home/default.nix | 5 +- nixos/hosts/thalassa/aoife/home/theme.nix | 33 +++++++++++ 5 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 nixos/hosts/thalassa/aoife/home/theme.nix diff --git a/flake.lock b/flake.lock index 4bed158..68e365d 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1667262410, - "narHash": "sha256-yqqvPvazG/Ci3WpIfPb+o+i2cNuyAYYY19lwJGCmUao=", + "lastModified": 1669854260, + "narHash": "sha256-Z8NAL3g4i5LAhxveNGJhrVDHxIBbUf1lVIy/Thr2RMU=", "owner": "lovesegfault", "repo": "beautysh", - "rev": "a1fdaff999db2dfc5032914630f5052360f4b432", + "rev": "d616eb8d9d05ee4fb33de9c5521d99c3f0695d52", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1669048207, - "narHash": "sha256-sCgM5+Dwz7qU8iBscP24JPvahyf01wQL0MPPz5n8amk=", + "lastModified": 1669471061, + "narHash": "sha256-7FdhCbyPB0ajZP/piWjyhd4bwHc9TZifY8htOjsmxt8=", "owner": "nix-community", "repo": "comma", - "rev": "959a31aaec134d75802a47271a8df09563098fa2", + "rev": "48b723b201e94958a29a35e4f64bb4391fe73464", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1669328018, - "narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", + "lastModified": 1669825171, + "narHash": "sha256-HxlZHSiRGXnWAFbIJMeujqBe2KgACYx5XDRY0EA9P+4=", "owner": "nix-community", "repo": "home-manager", - "rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", + "rev": "478610aa37c8339eacabfa03f07dacf5574edd47", "type": "github" }, "original": { @@ -397,11 +397,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1669376092, - "narHash": "sha256-COBsAjliwMbzzTulrUKAOLQwdhN3D2kc0VSsfBVPZ1E=", + "lastModified": 1669848587, + "narHash": "sha256-N1tQXZmmzVXxCAgWBIWmWOgcViMvN5dPMkS58eoSF9c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0e6e8461eb0139c2ecd4c66d7995cefe2a7f5195", + "rev": "b8ccf3dc3a03352bccae4cd01dcdd5bc3438c49f", "type": "github" }, "original": { @@ -417,11 +417,11 @@ ] }, "locked": { - "lastModified": 1668803733, - "narHash": "sha256-/zD2vsOlCE/7Qf4iDhRrJbK65SqCpF8qeBJUC7Go/wg=", + "lastModified": 1669635788, + "narHash": "sha256-xlJ4hbUm3KULq4daqopi+eAv1u57uLlTare04HL3X/c=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "e5d64c0be9662ab4b46b95d2e9af0a9f1fba4131", + "rev": "ab85578dce442b80aa3378fe0304e6cb6f16f593", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1658267644, - "narHash": "sha256-NJRe1rnlF112eZwxNASlRL8/ghwD8g+lpHIYRkWQxC8=", + "lastModified": 1669807829, + "narHash": "sha256-rgQ8MYV1UD4Ynw0wzfl9hatgsV5GV7X6eM6ioSPKzls=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "004c229ca44c069d93c92abf67ff1619fb508c6a", + "rev": "694e7d34f60028f4877517e1c7c73c9527fad400", "type": "gitlab" }, "original": { @@ -492,11 +492,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1669339063, - "narHash": "sha256-/NTh/VV7ypL9pDSKrog8PD17Q5PkCzEINwiZwCWwYso=", + "lastModified": 1669857900, + "narHash": "sha256-iR2lzvMURAKq1+h7OORDedL4EKzdWdMTg/VGqZR+sh0=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "2ad0daaf4dee0649e4cc570689094cbdb298a009", + "rev": "3d0c09b4c244674a18fe44063713589599278d18", "type": "github" }, "original": { @@ -677,11 +677,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669052418, - "narHash": "sha256-M1I4BKXBQm2gey1tScemEh5TpHHE3gKptL7BpWUvL8s=", + "lastModified": 1669542132, + "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "20fc948445a6c22d4e8d5178e9a6bc6e1f5417c8", + "rev": "a115bb9bd56831941be3776c8a94005867f316a7", "type": "github" }, "original": { @@ -731,11 +731,11 @@ "nmdSrc": "nmdSrc" }, "locked": { - "lastModified": 1668602255, - "narHash": "sha256-65Zv8tSMKXVdOhoXOxYBlO3jGvGpUlU4BwqAfcrJLYs=", + "lastModified": 1669827864, + "narHash": "sha256-mEHr0zkeeYv3phz09BjiM6G5iWBg9DtIrZV6BQZrPic=", "owner": "pta2002", "repo": "nixvim", - "rev": "a601a75d0cae8229f1416506bd172e4e4aef3ce7", + "rev": "bc045bd50a0bbb6d5b08965e9c7e375652975c8d", "type": "github" }, "original": { @@ -986,11 +986,11 @@ }, "utils_5": { "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix index dd36afb..65d2faf 100644 --- a/nixos/hosts/thalassa/aoife/configuration.nix +++ b/nixos/hosts/thalassa/aoife/configuration.nix @@ -50,6 +50,7 @@ # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; + services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; programs.dconf.enable = true; services.udisks2.enable = true; @@ -83,7 +84,10 @@ #media-session.enable = true; }; - environment.systemPackages = with pkgs; [ gnome3.gnome-tweaks ]; + environment.systemPackages = with pkgs; [ + gnome3.gnome-tweaks + wireguard-tools + ]; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.victor = { diff --git a/nixos/hosts/thalassa/aoife/home/dconf.nix b/nixos/hosts/thalassa/aoife/home/dconf.nix index 13d2c1b..49222e7 100644 --- a/nixos/hosts/thalassa/aoife/home/dconf.nix +++ b/nixos/hosts/thalassa/aoife/home/dconf.nix @@ -24,8 +24,8 @@ with lib.hm.gvariant; }; "org/gnome/mutter/keybindings" = { - "toggle-tiled-left" = [ "bracketleft" ]; - "toggle-tiled-right" = [ "bracketright" ]; + toggle-tiled-left = [ "bracketleft" ]; + toggle-tiled-right = [ "bracketright" ]; }; "org/gnome/desktop/wm/keybindings" = { diff --git a/nixos/hosts/thalassa/aoife/home/default.nix b/nixos/hosts/thalassa/aoife/home/default.nix index 20d60ec..602f327 100644 --- a/nixos/hosts/thalassa/aoife/home/default.nix +++ b/nixos/hosts/thalassa/aoife/home/default.nix @@ -13,12 +13,13 @@ in { imports = [ ./dconf.nix + ./theme.nix ]; home.packages = with pkgs; [ btop calibre - element-desktop-wayland + element-desktop fusee-launcher gcc gimp @@ -74,7 +75,6 @@ in { "latex.clean.subfolder.enabled" = true; "latex.outDir" = "%TMPDIR%/%RELATIVE_DOC%"; }; - # "workbench.colorTheme" = "Catppuccin Frappé"; "editor.fontFamily" = "'DejaVuSansMono Nerd Font', 'monospace', monospace"; "keyboard.dispatch" = "keyCode"; @@ -88,7 +88,6 @@ in { extensions = with pkgs.vscode-extensions; with pkgs.v.vscode-extensions; [ brettm12345.nixfmt-vscode - # catppuccin.catppuccin-vsc codezombiech.gitignore editorconfig.editorconfig foxundermoon.shell-format diff --git a/nixos/hosts/thalassa/aoife/home/theme.nix b/nixos/hosts/thalassa/aoife/home/theme.nix new file mode 100644 index 0000000..ca504e5 --- /dev/null +++ b/nixos/hosts/thalassa/aoife/home/theme.nix @@ -0,0 +1,33 @@ +{ lib, pkgs, config, ... }: +let + theme = "Catppuccin-Pink-Dark"; + cursorTheme = config.home.pointerCursor.name; +in { + home.pointerCursor = { + name = "Catppuccin-Frappe-Pink-Cursors"; + size = 32; + package = pkgs.catppuccin-cursors.frappePink; + }; + + gtk = { + enable = true; + theme = { + name = theme; + package = pkgs.catppuccin-gtk; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme.override { color = "violet"; }; + }; + cursorTheme = { + name = cursorTheme; + package = config.home.pointerCursor.package; + size = config.home.pointerCursor.size; + }; + }; + + programs.vscode = { + userSettings."workbench.colorTheme" = "Catppuccin Frappé"; + extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc ]; + }; +}