diff --git a/face.png b/face.png new file mode 100644 index 0000000..d520d8a Binary files /dev/null and b/face.png differ diff --git a/modules/gnome/home.nix b/modules/gnome/home.nix index 825bde4..c5b0ccd 100644 --- a/modules/gnome/home.nix +++ b/modules/gnome/home.nix @@ -6,34 +6,40 @@ }: let wallpaper = pkgs.writeShellScriptBin "wallpaper" (builtins.readFile ./wallpaper.sh); in { - dconf.settings = { + dconf.settings = with lib.hm.gvariant; { "org/gnome/shell" = { disable-user-extensions = false; enabled-extensions = [ "forge@jmmaranan.com" - "blur-my-shell@aunetx" + # Waiting for https://github.com/aunetx/blur-my-shell/issues/388 + # "blur-my-shell@aunetx" "launch-new-instance@gnome-shell-extensions.gcampax.github.com" - # "just-perfection-desktop@just-perfection" "rounded-window-corners@yilozt.shell-extension.zip" # Disable while not configured # "widgets@aylur" + # "just-perfection-desktop@just-perfection" ]; welcome-dialog-last-shown-version = 999999; }; "org/gnome/desktop/wm/preferences" = { auto-raise = true; + num-workspaces=9; }; # "org/gnome/shell/extensions/just-perfection" = { # activities-button = false; # startup-status = 0; # dash = false; # }; - "org/gnome/shell/world-clocks" = { - # locations = "[<(uint32 2, <('Nantes', 'LFRS', true, [(0.82321363634175626, -0.027925268031909273)], [(0.82408630096775348, -0.027052603405912107)])>)>]"; - }; + # "org/gnome/shell/world-clocks" = { + # locations = "[<(uint32 2, <('Nantes', 'LFRS', true, [(0.82321363634175626, -0.027925268031909273)], [(0.82408630096775348, -0.027052603405912107)])>)>]"; + # }; + # "org/gnome/Weather" = { + # locations = "[<(uint32 2, <('Tokyo', 'RJTI', true, [(0.62191898430954862, 2.4408429589140699)], [(0.62282074357417661, 2.4391218722853854)])>)>]"; + # }; "org/gnome/shell/weather" = { automatic-location = true; + # locations = "[<(uint32 2, <('Tokyo', 'RJTI', true, [(0.62191898430954862, 2.4408429589140699)], [(0.62282074357417661, 2.4391218722853854)])>)>]"; }; "org/gnome/desktop/peripherals/touchpad" = { tap-to-click = true; @@ -43,8 +49,8 @@ in { }; "org/gnome/mutter" = { experimental-features = ["scale-monitor-framebuffer"]; - # It does not work but I don't really care. - overlay-key = " "; + overlay-key = ""; + workspaces-only-on-primary=true; }; "org/gnome/desktop/interface" = { scaling-factor = 1.5; @@ -52,8 +58,15 @@ in { color-scheme = "prefer-dark"; enable-hot-corners = false; clock-show-weekday = true; + show-battery-percentage = true; }; + # "org/gnome/desktop/background" = { + # picture-uri = "file:///home/zoriya/.cache/current-wallpaper"; + # picture-uri-dark = "file:///home/zoriya/.cache/current-wallpaper"; + # }; "org/gnome/desktop/input-sources" = { + mru-sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "ibus" "mozc-jp" ]) ]; + sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "ibus" "mozc-jp" ]) ]; xkb-options = ["terminate:ctrl_alt_bksp" "caps:swapescape"]; }; @@ -86,12 +99,12 @@ in { wallpaper ]; - xdg.configFile."autostart/wallpaper.desktop".text = '' - [Desktop Entry] - Type=Application - Name=Wallpapers - Exec=wp - OnlyShowIn=GNOME; - ''; + # xdg.configFile."autostart/wallpaper.desktop".text = '' + # [Desktop Entry] + # Type=Application + # Name=Wallpapers + # Exec=wp + # OnlyShowIn=GNOME; + # ''; xdg.configFile."autostart/discord.desktop".text = pkgs.discord.desktopItem.text; } diff --git a/modules/gnome/wallpaper.sh b/modules/gnome/wallpaper.sh index 30b8081..858c6c7 100755 --- a/modules/gnome/wallpaper.sh +++ b/modules/gnome/wallpaper.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash WALLPAPERS=~/wallpapers/ -export SWWW_TRANSITION_FPS=90 -export SWWW_TRANSITION_STEP=90 -export SWWW_TRANSITION_DURATION=2 -export SWWW_TRANSITION=grow WP=$(find $WALLPAPERS -type f | shuf -n 1) ln -fs $WP ~/.cache/current-wallpaper diff --git a/modules/home/apps/default.nix b/modules/home/apps/default.nix index b218901..3a9816f 100644 --- a/modules/home/apps/default.nix +++ b/modules/home/apps/default.nix @@ -190,6 +190,7 @@ in { pictures = "${config.home.homeDirectory}/stuff"; publicShare = "${config.home.homeDirectory}/stuff"; }; + home.file.".face".source = ../../../face.png; xdg.configFile."nixpkgs/config.nix".text = '' { allowUnfree = true; } diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 32485f0..edf96f9 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -46,7 +46,6 @@ in { "downloads" "stuff" "projects" - "wallpapers" { directory = ".gnupg"; mode = "0700"; } { directory = ".ssh"; mode = "0700"; } ".local/share/direnv" @@ -67,5 +66,11 @@ in { ]; }; }; + + fileSystems."/home/zoriya/wallpapers" = { + device = "/home/zoriya/projects/flake/wallpapers/"; + fsType = "none"; + options = [ "bind" ]; + }; }; } diff --git a/modules/nixos/wayland/default.nix b/modules/nixos/wayland/default.nix index 2c7af33..2c3c5ed 100644 --- a/modules/nixos/wayland/default.nix +++ b/modules/nixos/wayland/default.nix @@ -31,16 +31,5 @@ in { security.sudo.extraConfig = '' Defaults lecture="never" ''; - - boot = { - kernelParams = ["quiet" "splash"]; - consoleLogLevel = 0; - initrd.verbose = false; - plymouth = { - enable = true; - themePackages = [pkgs.adi1090x-plymouth]; - theme = "colorful_loop"; - }; - }; }; } diff --git a/overlays/adi1090x-plymouth.nix b/overlays/adi1090x-plymouth.nix deleted file mode 100644 index fa4ab02..0000000 --- a/overlays/adi1090x-plymouth.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs ? import {} }: - pkgs.stdenv.mkDerivation { - pname = "adi1090x-plymouth"; - version = "0.0.1"; - - src = builtins.fetchGit { - url = "https://github.com/adi1090x/plymouth-themes"; - rev = "bf2f570bee8e84c5c20caac353cbe1d811a4745f"; - }; - - buildInputs = [ - pkgs.git - ]; - - configurePhase = '' - mkdir -p $out/share/plymouth/themes/ - ''; - - buildPhase = '' - ''; - - installPhase = '' - cp -r pack_1/colorful_loop $out/share/plymouth/themes - cat pack_1/colorful_loop/colorful_loop.plymouth | sed "s@\/usr\/@$out\/@" > $out/share/plymouth/themes/colorful_loop/colorful_loop.plymouth - ''; - } diff --git a/overlays/default.nix b/overlays/default.nix index b6344d7..79e6ec9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,3 @@ self: super: { - adi1090x-plymouth = super.callPackage ./adi1090x-plymouth.nix {}; tuxedo-keyboard = super.callPackage ./tuxedo-keyboard {}; }