From fc393ba3c9dc979bd51e5e1434694d5e5246b1b2 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 27 Jul 2024 18:18:35 +0800 Subject: [PATCH 01/52] feat(hakugyokurou): initial configuration --- global/auth/pub/hakugyokurou.pub | 1 + spec/hakugyokurou/default.nix | 65 ++++++++++++++++++++++ spec/hakugyokurou/jovian.nix | 93 ++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 global/auth/pub/hakugyokurou.pub create mode 100644 spec/hakugyokurou/default.nix create mode 100644 spec/hakugyokurou/jovian.nix diff --git a/global/auth/pub/hakugyokurou.pub b/global/auth/pub/hakugyokurou.pub new file mode 100644 index 00000000..4fa391d2 --- /dev/null +++ b/global/auth/pub/hakugyokurou.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHKCA0/6dsdVyLEgzWt8+u5lWVc0o6A3MY4M2Hf2BT8h koishi@hakugyokurou diff --git a/spec/hakugyokurou/default.nix b/spec/hakugyokurou/default.nix new file mode 100644 index 00000000..8d49af87 --- /dev/null +++ b/spec/hakugyokurou/default.nix @@ -0,0 +1,65 @@ +{ pkgs, lib, config, ... }: { + global = { + id = "09a2900f15b74f36b023a9ebcd539f6a"; + fs.esp.uuid = "AE73-B83E"; + fs.type = "xfs"; + fs.store = "e4c673cb-03c5-44ac-b2f1-1085a7f7a553"; + fs.cryptsetup.enable = true; + fs.cryptsetup.uuids.persist = "122001b1-7a43-4bab-ae7c-ba8eeb1cc864"; + boot.lanzaboote = true; + gpu.enable = true; + gpu.type = "amdgpu"; + }; + + home = { + jetbrains.enable = true; + vscode.enable = true; + minecraft.enable = true; + minecraft.user = "app"; + }; + + users.homeModules = [ { + wayland.windowManager.sway.config = { + input = { + "9610:30:HID_258a:001e_Mouse".natural_scroll = "disabled"; + "1539:61441:NVTK0603:00_0603:F001_UNKNOWN".map_to_output = "eDP-1"; + "1539:61441:NVTK0603:00_0603:F001".map_to_output = "eDP-1"; + }; + output = { + eDP-1.scale = "2"; + eDP-1.transform = "270"; + }; + }; + } ]; + + powerManagement.enable = true; + powerManagement.cpuFreqGovernor = "performance"; + boot.kernelParams = [ + "video=eDP-1:panel_orientation=left_side_up" + ]; + + jovian.steamos.useSteamOSConfig = lib.mkDefault false; + services.greetd.settings.default_session.command = let + cfg = config.programs.regreet; + in lib.mkOverride 999 "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" '' + ${lib.getExe pkgs.wlr-randr} --output eDP-1 --scale 2 --transform 90 + ${lib.getExe cfg.package} + ''}"; + environment.systemPackages = with pkgs; [ + (writeShellScriptBin "sway-logout" '' + ${systemd}/bin/systemctl --user unset-environment WAYLAND_DISPLAY SWAYSOCK + ${sway}/bin/swaymsg exit + '') + ]; + + hardware.enableRedistributableFirmware = true; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + hardware.cpu.intel.updateMicrocode = true; + + imports = [ + ./jovian.nix + ]; +} diff --git a/spec/hakugyokurou/jovian.nix b/spec/hakugyokurou/jovian.nix new file mode 100644 index 00000000..a50e3a40 --- /dev/null +++ b/spec/hakugyokurou/jovian.nix @@ -0,0 +1,93 @@ +{ pkgs, lib, config, jovian, ... }: with lib; { + specialisation.steamos.configuration = { + jovian = { + hardware.has.amd.gpu = true; + steamos.useSteamOSConfig = true; + steamos.enableDefaultCmdlineConfig = false; + + steam = { + enable = true; + autoStart = true; + desktopSession = "plasma"; + user = "app"; + }; + }; + + users.home.persistApp.directories = [ + ".steam" ".local/share/Steam" + ".config/gamescope" ".config/hhd" + ".kodi" + ]; + + users.users.app.extraGroups = [ "networkmanager" "gamemode" ]; + programs.gamemode.enable = true; + programs.regreet.enable = false; + home.plasma.enable = true; + home.plasma.extraConfig = { + configFile = { + kwinrc.Xwayland.Scale = 1.75; + kscreenlockerrc.Daemon.Autolock = false; + }; + }; + + home-manager.users.app = { + home.packages = with pkgs; [ + (pkgs.kodi-wayland.passthru.withPackages (kodiPkgs: with kodiPkgs; [ + joystick # keymap steam-controller + #controller-topology-project + libretro libretro-2048 + libretro-fuse libretro-genplus libretro-mgba + libretro-nestopia libretro-snes9x + jellycon + ])) + ]; + + home.pointerCursor = { + package = pkgs.steamdeck-hw-theme; + name = "steam"; + }; + }; + + services.handheld-daemon = { + enable = true; + user = "app"; + }; + + jovian.decky-loader = { + # ~/.steam/steam/.cef-enable-remote-debugging + enable = true; + user = "app"; + extraPackages = with pkgs; [ + curl unzip util-linux gnugrep procps pciutils kmod ryzenadj + ]; + extraPythonPackages = pythonPackages: with pythonPackages; [ + hid pyyaml + ]; + stateDir = "/nix/persist/decky"; + }; + + boot.kernelParams = [ + "iomem=relaxed" + "amd_pstate=passive" + ]; + boot.plymouth.themePackages = [ pkgs.steamdeck-hw-theme ]; + boot.plymouth.theme = "steamos"; + + services.udev.extraRules = '' + SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="${pkgs.ryzenadj}/bin/ryzenadj --max-performance" + ''; + + nixpkgs.overlays = [ (final: prev: { + gamescope = prev.gamescope.overrideAttrs (finalAttrs: previousAttrs: { + postInstall = previousAttrs.postInstall + "\n" + '' + wrapProgram "$out/bin/gamescope" \ + --append-flags "--force-orientation left" + ''; + }); + }) ]; + }; + + imports = [ + jovian.nixosModules.jovian + ]; +} From 9c2b48ea85a620c289c4b13d3f97e540d538f57b Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 27 Jul 2024 23:03:53 +0800 Subject: [PATCH 02/52] fix(hakugyokurou): correct Xwayland scale value --- spec/hakugyokurou/jovian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/hakugyokurou/jovian.nix b/spec/hakugyokurou/jovian.nix index a50e3a40..d486d6e5 100644 --- a/spec/hakugyokurou/jovian.nix +++ b/spec/hakugyokurou/jovian.nix @@ -25,7 +25,7 @@ home.plasma.enable = true; home.plasma.extraConfig = { configFile = { - kwinrc.Xwayland.Scale = 1.75; + kwinrc.Xwayland.Scale = 2; kscreenlockerrc.Daemon.Autolock = false; }; }; From e91e516e1a2b0b89f5249d830f2387bc8321c8f9 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 27 Jul 2024 23:05:13 +0800 Subject: [PATCH 03/52] fix(koumakyou): set cursor theme --- spec/koumakyou/jovian.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/spec/koumakyou/jovian.nix b/spec/koumakyou/jovian.nix index a5754ee1..f06d43f7 100644 --- a/spec/koumakyou/jovian.nix +++ b/spec/koumakyou/jovian.nix @@ -32,16 +32,23 @@ }; }; - home-manager.users.app.home.packages = with pkgs; [ - (pkgs.kodi-wayland.passthru.withPackages (kodiPkgs: with kodiPkgs; [ - joystick # keymap steam-controller - #controller-topology-project - libretro libretro-2048 - libretro-fuse libretro-genplus libretro-mgba - libretro-nestopia libretro-snes9x - jellycon - ])) - ]; + home-manager.users.app = { + home.packages = with pkgs; [ + (pkgs.kodi-wayland.passthru.withPackages (kodiPkgs: with kodiPkgs; [ + joystick # keymap steam-controller + #controller-topology-project + libretro libretro-2048 + libretro-fuse libretro-genplus libretro-mgba + libretro-nestopia libretro-snes9x + jellycon + ])) + ]; + + home.pointerCursor = { + package = pkgs.steamdeck-hw-theme; + name = "steam"; + }; + }; services.handheld-daemon = { enable = true; From 250bd3545f34cef5833a3af95a4c80a61ba35844 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 28 Jul 2024 16:06:12 +0800 Subject: [PATCH 04/52] chore(flake)!: bump inputs --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9f33d7a4..4f2efc23 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1722119539, + "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1721226562, - "narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=", + "lastModified": 1721993749, + "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "927eea31915468e06b94bedf678261dc7cf048c8", + "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { From 7f1f67e9567aac52578a6705fa5ab73276d8d3e7 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 14:19:20 +0800 Subject: [PATCH 05/52] fix(gnome): update gtk theme names --- home/gnome/impl/dconf.nix | 16 +++++++++------- home/gnome/impl/nixos.nix | 5 ++++- home/gnome/nixos.nix | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index f8426c5d..b729c39c 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -3,6 +3,7 @@ , config , ... }: with lib; let cfg = config.passthrough.gnome; + bg = ../../catppuccin/flake.png; in mkIf cfg.enable { dconf.settings = let p = "org/gnome"; @@ -26,18 +27,18 @@ in mkIf cfg.enable { "${pd}/background" = { color-shading-type = "solid"; picture-options = "zoom"; - picture-uri = "file://${../../../share/catppuccin-nix.png}"; - picture-uri-dark = "file://${../../../share/catppuccin-nix.png}"; + picture-uri = "file://${bg}"; + picture-uri-dark = "file://${bg}"; primary-color = "#000000000000"; secondary-color = "#000000000000"; }; "${pd}/interface" = { color-scheme = "prefer-dark"; - cursor-theme = "Catppuccin-Frappe-Dark-Cursors"; + cursor-theme = "catppuccin-mocha-dark-cursors"; font-antialiasing = "grayscale"; font-hinting = "slight"; - gtk-theme = "Catppuccin-Frappe-Compact-Pink-Dark"; + gtk-theme = "catppuccin-mocha-pink-compact"; icon-theme = "Papirus-Dark"; }; @@ -45,7 +46,7 @@ in mkIf cfg.enable { color-shading-type = "solid"; lock-enabled = false; picture-options = "zoom"; - picture-uri = "file://${../../../share/catppuccin-nix.png}"; + picture-uri = "file://${bg}"; primary-color = "#000000000000"; secondary-color = "#000000000000"; }; @@ -54,10 +55,11 @@ in mkIf cfg.enable { action-double-click-titlebar = "toggle-maximize"; action-middle-click-titlebar = "minimize"; button-layout = "close,minimize,maximize:appmenu"; + resize-with-right-button = true; }; "${ptlp}" = { - default = "71a9971e-e829-43a9-9b2f-4565c855d664"; + default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; list = [ "de8a9081-8352-4ce4-9519-5de655ad9361" "71a9971e-e829-43a9-9b2f-4565c855d664" @@ -162,7 +164,7 @@ in mkIf cfg.enable { welcome-dialog-last-shown-version = "45.3"; }; - "${pse}/user-theme".name = "Catppuccin-Frappe-Compact-Pink-Dark"; + "${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; "${pse}/dash-to-dock" = { background-opacity = 0.80000000000000004; diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index e7ebd0a8..57716860 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -10,7 +10,10 @@ in mkIf cfg.enable { services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + hardware.pulseaudio.enable = false; - users.home.persist.directories = [ ]; + users.home.persist.directories = [ + ".config/dconf" + ]; environment.persistence."/nix/persist/fhs".directories = [ ]; } diff --git a/home/gnome/nixos.nix b/home/gnome/nixos.nix index ee00b3ef..c7a3bd26 100644 --- a/home/gnome/nixos.nix +++ b/home/gnome/nixos.nix @@ -13,7 +13,7 @@ in { config = { users.homeModules = [ # this module passes gnome configuration to home-manager - { passthrough.gnome= cfg; } + { passthrough.gnome = cfg; } ]; specialisation.nognome = with cfg; mkIf enable { From 0209929c948b9cc7e3748f87982369d20f7248db Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 14:43:01 +0800 Subject: [PATCH 06/52] feat(hakugyokurou): enable gnome --- spec/hakugyokurou/default.nix | 3 +++ spec/hakugyokurou/jovian.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/spec/hakugyokurou/default.nix b/spec/hakugyokurou/default.nix index 8d49af87..f2f4f0f8 100644 --- a/spec/hakugyokurou/default.nix +++ b/spec/hakugyokurou/default.nix @@ -12,8 +12,10 @@ }; home = { + gnome.enable = true; jetbrains.enable = true; vscode.enable = true; + steam.enable = true; minecraft.enable = true; minecraft.user = "app"; }; @@ -52,6 +54,7 @@ '') ]; + hardware.sensor.iio.enable = true; hardware.enableRedistributableFirmware = true; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; diff --git a/spec/hakugyokurou/jovian.nix b/spec/hakugyokurou/jovian.nix index d486d6e5..68759ab7 100644 --- a/spec/hakugyokurou/jovian.nix +++ b/spec/hakugyokurou/jovian.nix @@ -22,6 +22,8 @@ users.users.app.extraGroups = [ "networkmanager" "gamemode" ]; programs.gamemode.enable = true; programs.regreet.enable = false; + home.gnome.enable = mkForce false; + home.steam.enable = mkForce false; home.plasma.enable = true; home.plasma.extraConfig = { configFile = { From 195878e7807880aa270f4753cc72b44e9572395e Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 15:40:41 +0800 Subject: [PATCH 07/52] feat(flatpak): add portals and persist --- global/flatpak/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 global/flatpak/default.nix diff --git a/global/flatpak/default.nix b/global/flatpak/default.nix new file mode 100644 index 00000000..48bafda6 --- /dev/null +++ b/global/flatpak/default.nix @@ -0,0 +1,17 @@ +{ pkgs +, lib +, config +, ... }: with lib; let + cfg = config.global.flatpak; +in { + options.global.flatpak = { + enable = mkEnableOption "flatpak sandbox"; + }; + + config = mkIf cfg.enable { + services.flatpak.enable = true; + xdg.portal.enable = true; + users.home.persist.directories = [ ".local/share/flatpak" ]; + environment.persistence."/nix/persist/fhs".directories = [ "/var/lib/flatpak" ]; + }; +} From e9bf8b292fc2618c9f4702b8a943bb38d21d3532 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 15:40:59 +0800 Subject: [PATCH 08/52] feat(gnome): enable flatpak by default --- home/gnome/impl/home.nix | 7 +++---- home/gnome/impl/nixos.nix | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/gnome/impl/home.nix b/home/gnome/impl/home.nix index 24d15901..d10861b1 100644 --- a/home/gnome/impl/home.nix +++ b/home/gnome/impl/home.nix @@ -5,11 +5,10 @@ cfg = config.passthrough.gnome; in mkIf cfg.enable { home.packages = - with pkgs; - with gnome; - with gnomeExtensions; [ + with pkgs.gnome; + with pkgs.gnomeExtensions; [ # gnome - gnome-terminal + pkgs.gnome-terminal # gnomeExtensions dash-to-panel diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index 57716860..c05b24e4 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -4,12 +4,14 @@ , ... }: with lib; let cfg = config.home.gnome; in mkIf cfg.enable { + global.flatpak.enable = mkDefault true; programs.regreet.enable = false; services.xserver.enable = true; services.xserver.displayManager.startx.enable = false; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + xdg.portal.configPackages = with pkgs; [ gnome.gnome-session ]; hardware.pulseaudio.enable = false; users.home.persist.directories = [ From 94bf2f98479d824b8f78c11810f08f3084614875 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 19:56:16 +0800 Subject: [PATCH 09/52] fix(gnome): disable theme --- home/gnome/impl/dconf.nix | 53 ++++++++++++++++++++++++++++++--------- home/gnome/impl/home.nix | 7 +++--- home/gnome/impl/nixos.nix | 13 +++++++--- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index b729c39c..4edf9c72 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -3,7 +3,7 @@ , config , ... }: with lib; let cfg = config.passthrough.gnome; - bg = ../../catppuccin/flake.png; + bg = ../../../share/54345906_p0.jpg; in mkIf cfg.enable { dconf.settings = let p = "org/gnome"; @@ -35,11 +35,11 @@ in mkIf cfg.enable { "${pd}/interface" = { color-scheme = "prefer-dark"; - cursor-theme = "catppuccin-mocha-dark-cursors"; + #cursor-theme = "catppuccin-mocha-dark-cursors"; font-antialiasing = "grayscale"; font-hinting = "slight"; - gtk-theme = "catppuccin-mocha-pink-compact"; - icon-theme = "Papirus-Dark"; + #gtk-theme = "catppuccin-mocha-pink-compact"; + #icon-theme = "Papirus-Dark"; }; "${pd}/screensaver" = { @@ -54,12 +54,12 @@ in mkIf cfg.enable { "${pd}/wm/preferences" = { action-double-click-titlebar = "toggle-maximize"; action-middle-click-titlebar = "minimize"; - button-layout = "close,minimize,maximize:appmenu"; + button-layout = "close:appmenu"; resize-with-right-button = true; }; "${ptlp}" = { - default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; + #default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; list = [ "de8a9081-8352-4ce4-9519-5de655ad9361" "71a9971e-e829-43a9-9b2f-4565c855d664" @@ -153,18 +153,19 @@ in mkIf cfg.enable { "windowsNavigator@gnome-shell-extensions.gcampax.github.com" "window-list@gnome-shell-extensions.gcampax.github.com" "workspace-indicator@gnome-shell-extensions.gcampax.github.com" - "dash-to-panel@jderose9.github.com" + "dash-to-dock@micxgx.gmail.com" ]; enabled-extensions = [ "user-theme@gnome-shell-extensions.gcampax.github.com" "apps-menu@gnome-shell-extensions.gcampax.github.com" "drive-menu@gnome-shell-extensions.gcampax.github.com" - "dash-to-dock@micxgx.gmail.com" + "appindicatorsupport@rgcjonas.gmail.com" + "dash-to-panel@jderose9.github.com" ]; welcome-dialog-last-shown-version = "45.3"; }; - "${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; + #"${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; "${pse}/dash-to-dock" = { background-opacity = 0.80000000000000004; @@ -172,22 +173,50 @@ in mkIf cfg.enable { dock-position = "BOTTOM"; height-fraction = 0.90000000000000002; multi-monitor = true; + running-indicator-style = "DOTS"; + custom-theme-shrink = true; }; "${pse}/dash-to-panel" = { - animate-appicon-hover-animation-extent = ''{'RIPPLE': 4, 'PLANK': 4, 'SIMPLE': 1}''; + animate-appicon-hover = false; + animate-appicon-hover-animation-type = "SIMPLE"; appicon-margin = 0; appicon-padding = 4; + appicon-style= "NORMAL"; available-monitors = [ 0 ]; dot-position = "BOTTOM"; + dot-style-focused = "METRO"; + dot-style-unfocused = "DOTS"; + group-apps = true; + hide-overview-on-startup = true; hotkeys-overlay-combo = "TEMPORARILY"; + isolate-workspaces = false; leftbox-padding = -1; + overview-click-to-exit = true; panel-anchors = ''{"0":"MIDDLE"}''; - panel-lengths=''{"0":100}''; - panel-sizes=''{"0":42}''; + panel-element-positions = ''{"0":[{"element":"showAppsButton","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"leftBox","visible":false,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"centerMonitor"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}''; + panel-lengths = ''{"0":100}''; + panel-positions = ''{"0":"BOTTOM"}''; + panel-sizes = ''{"0":42}''; primary-monitor = 0; + secondarymenu-contains-showdetails = true; + show-showdesktop-hover = true; status-icon-padding = -1; + stockgs-force-hotcorner = false; + stockgs-keep-dash = false; + stockgs-keep-top-panel = false; + stockgs-panelbtn-click-only = false; + trans-bg-color = "#82a5c1"; + trans-dynamic-anim-target = 0.80000000000000002; + trans-dynamic-behavior = "MAXIMIZED_WINDOWS"; + trans-gradient-bottom-color = "#000000"; + trans-gradient-bottom-opacity = 0.5; + trans-gradient-top-opacity = 0.0; + trans-panel-opacity = 0.0; trans-use-custom-bg = false; + trans-use-custom-gradient = true; + trans-use-custom-opacity = true; + trans-use-dynamic-opacity = true; tray-padding = -1; window-preview-title-position = "TOP"; }; diff --git a/home/gnome/impl/home.nix b/home/gnome/impl/home.nix index d10861b1..8abf18ef 100644 --- a/home/gnome/impl/home.nix +++ b/home/gnome/impl/home.nix @@ -7,12 +7,13 @@ in mkIf cfg.enable { home.packages = with pkgs.gnome; with pkgs.gnomeExtensions; [ - # gnome - pkgs.gnome-terminal - # gnomeExtensions dash-to-panel dash-to-dock appindicator ]; + + catppuccin.enable = mkForce false; + home.pointerCursor = mkForce null; + gtk.enable = false; } diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index c05b24e4..bd5d6ff1 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -5,6 +5,8 @@ cfg = config.home.gnome; in mkIf cfg.enable { global.flatpak.enable = mkDefault true; + home.catppuccin.enable = mkDefault false; + catppuccin.enable = false; programs.regreet.enable = false; services.xserver.enable = true; services.xserver.displayManager.startx.enable = false; @@ -14,8 +16,13 @@ in mkIf cfg.enable { xdg.portal.configPackages = with pkgs; [ gnome.gnome-session ]; hardware.pulseaudio.enable = false; - users.home.persist.directories = [ - ".config/dconf" - ]; + environment.gnome.excludePackages = (with pkgs; [ + gnome-tour + ] ++ optionals config.global.flatpak.enable [ + gnome-calculator + ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ + ]); + + users.home.persist.directories = [ ".config/dconf" ]; environment.persistence."/nix/persist/fhs".directories = [ ]; } From 5b549b0c35d5fc770722f63cffd87e28122bf528 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 20:01:06 +0800 Subject: [PATCH 10/52] fix(hakugyokurou): set plymouth scale --- spec/hakugyokurou/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/hakugyokurou/default.nix b/spec/hakugyokurou/default.nix index f2f4f0f8..fcf7536d 100644 --- a/spec/hakugyokurou/default.nix +++ b/spec/hakugyokurou/default.nix @@ -39,6 +39,9 @@ boot.kernelParams = [ "video=eDP-1:panel_orientation=left_side_up" ]; + boot.plymouth.extraConfig = '' + DeviceScale=2 + ''; jovian.steamos.useSteamOSConfig = lib.mkDefault false; services.greetd.settings.default_session.command = let From 3afc10527ed860761389aabad1db22cf23776321 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 23:44:44 +0800 Subject: [PATCH 11/52] feat(gnome): move applications to flatpak --- home/gnome/impl/dconf.nix | 35 +++++++++++++++++++++++++++++++++++ home/gnome/impl/nixos.nix | 21 +++++++++++++++++++++ home/gui/nixos.nix | 2 +- home/util/home.nix | 7 ++++--- home/util/nixos.nix | 2 ++ 5 files changed, 63 insertions(+), 4 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 4edf9c72..88a265af 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -58,6 +58,41 @@ in mkIf cfg.enable { resize-with-right-button = true; }; + "${pd}/wm/keybindings" = { + move-to-workspace-1 = [ "1" ]; + move-to-workspace-2 = [ "2" ]; + move-to-workspace-3 = [ "3" ]; + move-to-workspace-4 = [ "4" ]; + switch-to-workspace-1 = [ "1" ]; + switch-to-workspace-2 = [ "2" ]; + switch-to-workspace-3 = [ "3" ]; + switch-to-workspace-4 = [ "4" ]; + }; + + "${ps}/keybindings" = { + switch-to-application-1 = [ ]; + switch-to-application-2 = [ ]; + switch-to-application-3 = [ ]; + switch-to-application-4 = [ ]; + switch-to-application-5 = [ ]; + switch-to-application-6 = [ ]; + switch-to-application-7 = [ ]; + switch-to-application-8 = [ ]; + switch-to-application-9 = [ ]; + }; + + "${p}/settings-daemon/plugins/media-keys" = { + custom-keybindings = [ + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" + ]; + }; + + "${p}/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + binding = "Return"; + command = "kgx"; + name = "Launch console"; + }; + "${ptlp}" = { #default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; list = [ diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index bd5d6ff1..41a5a517 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -17,10 +17,31 @@ in mkIf cfg.enable { hardware.pulseaudio.enable = false; environment.gnome.excludePackages = (with pkgs; [ + snapshot gnome-tour ] ++ optionals config.global.flatpak.enable [ + baobab + simple-scan + evince + file-roller + geary + loupe + seahorse + totem + epiphany gnome-calculator + gnome-calendar + gnome-connections + gnome-font-viewer + gnome-text-editor ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ + gnome-characters + gnome-clocks + gnome-contacts + gnome-logs + gnome-maps + gnome-music + gnome-weather ]); users.home.persist.directories = [ ".config/dconf" ]; diff --git a/home/gui/nixos.nix b/home/gui/nixos.nix index 6b1fccd3..0e655654 100644 --- a/home/gui/nixos.nix +++ b/home/gui/nixos.nix @@ -30,7 +30,7 @@ in { dconf.enable = true; }; services = mkIf gui { - blueman.enable = true; + blueman.enable = !config.global.flatpak.enable; }; }; } diff --git a/home/util/home.nix b/home/util/home.nix index 19d6eb0d..2c377008 100644 --- a/home/util/home.nix +++ b/home/util/home.nix @@ -14,14 +14,15 @@ in { ] ++ optionals config.passthrough.gui [ gtk-engine-murrine gnome-themes-extra - xfce.thunar gimp - jellyfin-media-player mission-planner - betaflight-configurator inav-configurator inav-blackbox-tools (blhelisuite32.override { workdir = "${config.home.homeDirectory}/.blhelisuite32"; }) + ] ++ optionals (config.passthrough.gui && !config.passthrough.flatpak.enable) [ + xfce.thunar gimp + jellyfin-media-player + betaflight-configurator expresslrs-configurator ]; diff --git a/home/util/nixos.nix b/home/util/nixos.nix index 4e55af9a..e69f027d 100644 --- a/home/util/nixos.nix +++ b/home/util/nixos.nix @@ -13,6 +13,8 @@ in { users.homeModules = [ # this module passes util configuration to home-manager { passthrough.util = cfg; } + # this module passes flatpak configuration to home-manager + { passthrough.flatpak = config.global.flatpak; } ]; programs.zsh.enable = true; From a6613c5946bbbb9bcdaee83a9aee2312df0e108c Mon Sep 17 00:00:00 2001 From: 514fpv Date: Tue, 30 Jul 2024 18:45:20 +0800 Subject: [PATCH 12/52] fix(gnome): add some gnome-specific theming --- home/gnome/impl/dconf.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 88a265af..fb1a3d8c 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -35,11 +35,11 @@ in mkIf cfg.enable { "${pd}/interface" = { color-scheme = "prefer-dark"; - #cursor-theme = "catppuccin-mocha-dark-cursors"; + cursor-theme = "Bibata-Modern-Classic"; font-antialiasing = "grayscale"; font-hinting = "slight"; - #gtk-theme = "catppuccin-mocha-pink-compact"; - #icon-theme = "Papirus-Dark"; + gtk-theme = "Adwaita-dark"; + icon-theme = "Papirus"; }; "${pd}/screensaver" = { From 236ea9ad253bc8e8a3f0fed1966ae9c9b0797e7c Mon Sep 17 00:00:00 2001 From: 514fpv Date: Tue, 30 Jul 2024 18:51:45 +0800 Subject: [PATCH 13/52] fix(gnome): improve gtk3 theme consistency --- home/gnome/impl/dconf.nix | 4 ++-- home/gnome/impl/home.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index fb1a3d8c..21b45593 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -38,8 +38,8 @@ in mkIf cfg.enable { cursor-theme = "Bibata-Modern-Classic"; font-antialiasing = "grayscale"; font-hinting = "slight"; - gtk-theme = "Adwaita-dark"; - icon-theme = "Papirus"; + gtk-theme = "adw-gtk3-dark"; + icon-theme = "Papirus-Dark"; }; "${pd}/screensaver" = { diff --git a/home/gnome/impl/home.nix b/home/gnome/impl/home.nix index 8abf18ef..f01abc33 100644 --- a/home/gnome/impl/home.nix +++ b/home/gnome/impl/home.nix @@ -5,8 +5,12 @@ cfg = config.passthrough.gnome; in mkIf cfg.enable { home.packages = - with pkgs.gnome; - with pkgs.gnomeExtensions; [ + with pkgs; + with gnome; + with gnomeExtensions; [ + # gtk3 theme + adw-gtk3 + # gnomeExtensions dash-to-panel dash-to-dock From d566409e94fd05c95c28ab9022d3b4e6c676600c Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 3 Aug 2024 18:02:17 +0800 Subject: [PATCH 14/52] fix(gnome): add more shortcuts --- home/gnome/impl/dconf.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 21b45593..6cb920b8 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -59,10 +59,16 @@ in mkIf cfg.enable { }; "${pd}/wm/keybindings" = { + panel-run-dialog = [ ]; + begin-resize = [ "r" ]; + close = [ "q" ]; + minimize = [ "BackSpace" ]; move-to-workspace-1 = [ "1" ]; move-to-workspace-2 = [ "2" ]; move-to-workspace-3 = [ "3" ]; move-to-workspace-4 = [ "4" ]; + move-to-workspace-left = [ "h" ]; + move-to-workspace-right = [ "l" ]; switch-to-workspace-1 = [ "1" ]; switch-to-workspace-2 = [ "2" ]; switch-to-workspace-3 = [ "3" ]; @@ -79,12 +85,16 @@ in mkIf cfg.enable { switch-to-application-7 = [ ]; switch-to-application-8 = [ ]; switch-to-application-9 = [ ]; + toggle-application-view = [ "d" ]; }; "${p}/settings-daemon/plugins/media-keys" = { custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/" ]; + logout = [ ]; + screensaver = [ "l" ]; }; "${p}/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { @@ -93,6 +103,12 @@ in mkIf cfg.enable { name = "Launch console"; }; + "${p}/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = { + binding = "q"; + command = "google-chrome-stable"; + name = "Launch Google Chrome"; + }; + "${ptlp}" = { #default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; list = [ From 79ee409aa14f3a3c5a63e805c3b2f0e45aa540bd Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 4 Aug 2024 12:27:11 +0800 Subject: [PATCH 15/52] feat(hakugyokurou): enable android --- spec/hakugyokurou/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/hakugyokurou/default.nix b/spec/hakugyokurou/default.nix index fcf7536d..a2032d45 100644 --- a/spec/hakugyokurou/default.nix +++ b/spec/hakugyokurou/default.nix @@ -9,6 +9,7 @@ boot.lanzaboote = true; gpu.enable = true; gpu.type = "amdgpu"; + android.enable = true; }; home = { From fb006e596971b28627b0b9fbeee33eb481d6794d Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 4 Aug 2024 12:28:13 +0800 Subject: [PATCH 16/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 4f2efc23..83f01ba3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1722661201, + "narHash": "sha256-2JX3S1hmmUhHuyGyGWnaM4xT0SiaDdVkNzmBrEowwK0=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "19a0f144f0204a12a89243363efb6a493b8cfc83", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1722119539, - "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1721993749, - "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", + "lastModified": 1722666143, + "narHash": "sha256-uTr3LiytFHFUYmIrhs5NoGlm5DCJxQlfyaZEKCU/DS8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", + "rev": "bcfe9dc708c92590fec676692b3ed79443eda819", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1721724566, - "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", + "lastModified": 1722693897, + "narHash": "sha256-Gpa3Gf60AqshNJKUP5mAmVImFFQ6BsWG+zbqx0JGFD4=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", + "rev": "b17a2666bcf400cf245528d143597d1480e298f8", "type": "github" }, "original": { From cf218d666d543c463e76c1018fa96fe23588c050 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 4 Aug 2024 13:05:00 +0800 Subject: [PATCH 17/52] fix(gnome): add more shortcuts --- home/gnome/impl/dconf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 6cb920b8..ba4a1569 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -73,6 +73,7 @@ in mkIf cfg.enable { switch-to-workspace-2 = [ "2" ]; switch-to-workspace-3 = [ "3" ]; switch-to-workspace-4 = [ "4" ]; + toggle-maximized = [ "f" ]; }; "${ps}/keybindings" = { From 5d86e402726f5c115c72086f6075567719911baa Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 4 Aug 2024 17:20:50 +0800 Subject: [PATCH 18/52] feat(gnome): set power profile toggle --- home/gnome/impl/dconf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index ba4a1569..59484807 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -214,6 +214,7 @@ in mkIf cfg.enable { "appindicatorsupport@rgcjonas.gmail.com" "dash-to-panel@jderose9.github.com" ]; + last-selected-power-profile = "performance"; welcome-dialog-last-shown-version = "45.3"; }; From 8bf10bb62a71534726d0dd055407f0927eb7bc60 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Wed, 7 Aug 2024 22:49:43 +0800 Subject: [PATCH 19/52] fix(flatpak): add var persist --- global/flatpak/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/flatpak/default.nix b/global/flatpak/default.nix index 48bafda6..a3b77f76 100644 --- a/global/flatpak/default.nix +++ b/global/flatpak/default.nix @@ -11,7 +11,7 @@ in { config = mkIf cfg.enable { services.flatpak.enable = true; xdg.portal.enable = true; - users.home.persist.directories = [ ".local/share/flatpak" ]; + users.home.persist.directories = [ ".local/share/flatpak" ".var" ]; environment.persistence."/nix/persist/fhs".directories = [ "/var/lib/flatpak" ]; }; } From f1238f9380fee4cbb24c6b11148d77e08f35a3c5 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Wed, 7 Aug 2024 23:01:06 +0800 Subject: [PATCH 20/52] fix(util): remove persist unnecessary for flatpak --- home/util/nixos.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/home/util/nixos.nix b/home/util/nixos.nix index e69f027d..990d9e61 100644 --- a/home/util/nixos.nix +++ b/home/util/nixos.nix @@ -25,18 +25,20 @@ in { ".cache/nix-index" ] ++ optionals gui [ + # mission-planner + ".local/share/Mission Planner" + # inav-configurator + ".config/inav-configurator" + ] ++ + optionals (gui && !config.global.flatpak.enable) [ # jellyfin-media-player ".config/jellyfin.org" ".local/share/jellyfinmediaplayer" ".local/share/Jellyfin Media Player" - # mission-planner - ".local/share/Mission Planner" # expresslrs-configurator ".config/ExpressLRS Configurator" # betaflight-configurator ".config/betaflight-configurator" - # inav-configurator - ".config/inav-configurator" ]; }; } From a2029ca2025421a50fa1a2f7385b9926c45f5802 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Tue, 13 Aug 2024 10:10:58 +0800 Subject: [PATCH 21/52] chore(flake)!: bump inputs --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 83f01ba3..4e6263a1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1722661201, - "narHash": "sha256-2JX3S1hmmUhHuyGyGWnaM4xT0SiaDdVkNzmBrEowwK0=", + "lastModified": 1722997334, + "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", "owner": "catppuccin", "repo": "nix", - "rev": "19a0f144f0204a12a89243363efb6a493b8cfc83", + "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722666143, - "narHash": "sha256-uTr3LiytFHFUYmIrhs5NoGlm5DCJxQlfyaZEKCU/DS8=", + "lastModified": 1723367191, + "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bcfe9dc708c92590fec676692b3ed79443eda819", + "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1722693897, - "narHash": "sha256-Gpa3Gf60AqshNJKUP5mAmVImFFQ6BsWG+zbqx0JGFD4=", + "lastModified": 1723483411, + "narHash": "sha256-h6F9JK9PrrTmt5WgsZChLCn7ECk+G/cYJL2CuQVY/Cc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b17a2666bcf400cf245528d143597d1480e298f8", + "rev": "b3b9d4ce20d75319c20a7faada08ad9135a1f008", "type": "github" }, "original": { From b33f8349039cd1df0d437e7c160663573e93b884 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Thu, 15 Aug 2024 18:26:59 +0800 Subject: [PATCH 22/52] fix(gnome): disable d2p multi-monitor --- home/gnome/impl/dconf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 59484807..f1cb59d6 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -225,7 +225,7 @@ in mkIf cfg.enable { dash-max-icon-size = 48; dock-position = "BOTTOM"; height-fraction = 0.90000000000000002; - multi-monitor = true; + multi-monitor = false; running-indicator-style = "DOTS"; custom-theme-shrink = true; }; From 08a362c3392f6feb65e355019d2bb0218e978f05 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Thu, 15 Aug 2024 20:50:14 +0800 Subject: [PATCH 23/52] feat(gnome): add extensions --- home/gnome/impl/dconf.nix | 8 +++++++- home/gnome/impl/home.nix | 2 ++ home/gnome/impl/nixos.nix | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index f1cb59d6..2f1b1a55 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -213,6 +213,8 @@ in mkIf cfg.enable { "drive-menu@gnome-shell-extensions.gcampax.github.com" "appindicatorsupport@rgcjonas.gmail.com" "dash-to-panel@jderose9.github.com" + "caffeine@patapon.info" + "PrivacyMenu@stuarthayhurst" ]; last-selected-power-profile = "performance"; welcome-dialog-last-shown-version = "45.3"; @@ -220,6 +222,10 @@ in mkIf cfg.enable { #"${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; + "${pse}/caffeine" = { + screen-blank = "always"; + }; + "${pse}/dash-to-dock" = { background-opacity = 0.80000000000000004; dash-max-icon-size = 48; @@ -260,7 +266,7 @@ in mkIf cfg.enable { stockgs-keep-top-panel = false; stockgs-panelbtn-click-only = false; trans-bg-color = "#82a5c1"; - trans-dynamic-anim-target = 0.80000000000000002; + trans-dynamic-anim-target = 1.0; trans-dynamic-behavior = "MAXIMIZED_WINDOWS"; trans-gradient-bottom-color = "#000000"; trans-gradient-bottom-opacity = 0.5; diff --git a/home/gnome/impl/home.nix b/home/gnome/impl/home.nix index f01abc33..8e034b20 100644 --- a/home/gnome/impl/home.nix +++ b/home/gnome/impl/home.nix @@ -12,9 +12,11 @@ in mkIf cfg.enable { adw-gtk3 # gnomeExtensions + caffeine dash-to-panel dash-to-dock appindicator + privacy-settings-menu ]; catppuccin.enable = mkForce false; diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index 41a5a517..28b2236f 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -13,6 +13,7 @@ in mkIf cfg.enable { services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + services.hardware.bolt.enable = true; xdg.portal.configPackages = with pkgs; [ gnome.gnome-session ]; hardware.pulseaudio.enable = false; From 430b48beb829405d162ec8b86912b7778b5403fb Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 17 Aug 2024 20:07:47 +0800 Subject: [PATCH 24/52] feat(reimaden): enable gnome --- spec/reimaden/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/reimaden/default.nix b/spec/reimaden/default.nix index 447d1f8a..cef0b1ff 100644 --- a/spec/reimaden/default.nix +++ b/spec/reimaden/default.nix @@ -11,7 +11,8 @@ }; home = { - plasma.specialise = true; + gnome.enable = true; + #plasma.specialise = true; #headless.enable = "eDP-1"; gyroflow.enable = true; jetbrains.enable = true; From 5f52e997d70f9d1648a2dea3cfb9fdcef3cd6ae3 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 17 Aug 2024 20:08:02 +0800 Subject: [PATCH 25/52] feat(fs): add zfs option --- global/fs/zfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/global/fs/zfs/default.nix b/global/fs/zfs/default.nix index 10c88a85..61976560 100644 --- a/global/fs/zfs/default.nix +++ b/global/fs/zfs/default.nix @@ -83,6 +83,7 @@ in { fileSystems = (mapAttrs (path: dataset: { device = "${cfg.zfs.persist}/${dataset}"; fsType = "zfs"; + options = [ "zfsutil" ]; # required by impermanence neededForBoot = true; }) cfg.zfs.mountpoints) // { From 1a0efefa3277a2a1e65170c594e5a6ea6ccf449d Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 17 Aug 2024 20:08:25 +0800 Subject: [PATCH 26/52] fix(io): udisks ignore zvols --- global/io/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/global/io/default.nix b/global/io/default.nix index 9763ec11..cc0b1331 100644 --- a/global/io/default.nix +++ b/global/io/default.nix @@ -13,7 +13,10 @@ in { }; config = { - services.udev.extraRules = "" + (if cfg.betaflight then '' + services.udev.extraRules = '' + # ignore zvols + KERNEL=="zd*", ENV{UDISKS_IGNORE}="1" + '' + (if cfg.betaflight then '' # DFU (Internal bootloader for STM32 and AT32 MCUs) SUBSYSTEM=="usb", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="df11", MODE="0664", GROUP="dialout" SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="0664", GROUP="dialout" From 05bd719cf5446f13cc461791a6f3298cd8f41397 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 18 Aug 2024 13:33:29 +0800 Subject: [PATCH 27/52] fix(reimaden): disable unsandboxed minecraft --- spec/reimaden/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/reimaden/default.nix b/spec/reimaden/default.nix index cef0b1ff..10962ef7 100644 --- a/spec/reimaden/default.nix +++ b/spec/reimaden/default.nix @@ -12,13 +12,11 @@ home = { gnome.enable = true; - #plasma.specialise = true; #headless.enable = "eDP-1"; gyroflow.enable = true; jetbrains.enable = true; vscode.enable = true; libreoffice.enable = true; - minecraft.enable = true; steam.enable = true; }; From ca243e9d620c7b7c004fbff682eb3b5f5d623295 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Wed, 28 Aug 2024 22:15:58 +0800 Subject: [PATCH 28/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++-------------------- global/io/default.nix | 1 + home/catppuccin/nixos.nix | 10 ++++++---- home/gnome/impl/nixos.nix | 2 +- home/gyroflow/home.nix | 3 ++- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 4e6263a1..af7876d4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1722997334, - "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", + "lastModified": 1724469296, + "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "owner": "catppuccin", "repo": "nix", - "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", + "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1724489415, + "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1723367191, - "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", + "lastModified": 1724837759, + "narHash": "sha256-gt1mCTlqnirTHAG8Q90IWEs91fRsTSjBqXhb6bQboe8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", + "rev": "a679e3a0ef9d3d43639f7ba894069c43e2d39c2c", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1723483411, - "narHash": "sha256-h6F9JK9PrrTmt5WgsZChLCn7ECk+G/cYJL2CuQVY/Cc=", + "lastModified": 1724556439, + "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b3b9d4ce20d75319c20a7faada08ad9135a1f008", + "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "type": "github" }, "original": { diff --git a/global/io/default.nix b/global/io/default.nix index cc0b1331..407a3de2 100644 --- a/global/io/default.nix +++ b/global/io/default.nix @@ -48,6 +48,7 @@ in { environment.persistence."/nix/persist/fhs".directories = [ "/var/log" + "/var/lib/nixos" "/var/lib/systemd/backlight" ] ++ optional config.networking.networkmanager.enable "/etc/NetworkManager/system-connections" ++ diff --git a/home/catppuccin/nixos.nix b/home/catppuccin/nixos.nix index c68d41ff..dbdf05cc 100644 --- a/home/catppuccin/nixos.nix +++ b/home/catppuccin/nixos.nix @@ -65,12 +65,14 @@ in { # override greetd theme programs.regreet = mkIf cfg.enable { + theme = { + inherit (cfg.gtk) name package; + }; + cursorTheme = { + inherit (cfg.cursor) name package; + }; settings = { background.path = ./solid.png; - GTK = { - theme_name = cfg.gtk.name; - cursor_theme_name = cfg.cursor.name; - }; }; }; }; diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index 28b2236f..f870a99c 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -35,7 +35,6 @@ in mkIf cfg.enable { gnome-connections gnome-font-viewer gnome-text-editor - ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ gnome-characters gnome-clocks gnome-contacts @@ -43,6 +42,7 @@ in mkIf cfg.enable { gnome-maps gnome-music gnome-weather + ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ ]); users.home.persist.directories = [ ".config/dconf" ]; diff --git a/home/gyroflow/home.nix b/home/gyroflow/home.nix index 5ec39359..abff2f37 100644 --- a/home/gyroflow/home.nix +++ b/home/gyroflow/home.nix @@ -4,7 +4,8 @@ , ... }: with lib; let cfg = config.passthrough.gyroflow; in mkIf cfg.enable { - home.packages = [ cfg.package ]; + # temporarily gone until regression is fixed + #home.packages = [ cfg.package ]; wayland.windowManager.sway.config.window.commands = [ { criteria.app_id = "xyz.gyroflow.gyroflow"; command = "floating enable"; } From 5db8ac7db94fc7edb83f138b522aeb1210084753 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 31 Aug 2024 21:25:47 +0800 Subject: [PATCH 29/52] fix(gnome): add some gnome-specific theming --- home/gnome/impl/dconf.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 2f1b1a55..da11cf46 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -249,6 +249,9 @@ in mkIf cfg.enable { group-apps = true; hide-overview-on-startup = true; hotkeys-overlay-combo = "TEMPORARILY"; + intellihide = true; + intellihide-behaviour = "MAXIMIZED_WINDOWS"; + intellihide-hide-from-windows = true; isolate-workspaces = false; leftbox-padding = -1; overview-click-to-exit = true; @@ -265,14 +268,14 @@ in mkIf cfg.enable { stockgs-keep-dash = false; stockgs-keep-top-panel = false; stockgs-panelbtn-click-only = false; - trans-bg-color = "#82a5c1"; + trans-bg-color = "#2a2a2a"; trans-dynamic-anim-target = 1.0; trans-dynamic-behavior = "MAXIMIZED_WINDOWS"; trans-gradient-bottom-color = "#000000"; trans-gradient-bottom-opacity = 0.5; trans-gradient-top-opacity = 0.0; trans-panel-opacity = 0.0; - trans-use-custom-bg = false; + trans-use-custom-bg = true; trans-use-custom-gradient = true; trans-use-custom-opacity = true; trans-use-dynamic-opacity = true; From 156fcf69bed948857b7a132fd21e6994b23edb27 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 2 Sep 2024 22:14:26 +0800 Subject: [PATCH 30/52] fix(gnome): add monitors persist --- home/gnome/impl/dconf.nix | 2 +- home/gnome/impl/nixos.nix | 1 + spec/yume/default.nix | 17 +---------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index da11cf46..42c82ff2 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -223,7 +223,7 @@ in mkIf cfg.enable { #"${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; "${pse}/caffeine" = { - screen-blank = "always"; + screen-blank = "never"; }; "${pse}/dash-to-dock" = { diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index f870a99c..e95def1e 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -46,5 +46,6 @@ in mkIf cfg.enable { ]); users.home.persist.directories = [ ".config/dconf" ]; + users.home.persist.files = [ ".config/monitors.xml" ]; environment.persistence."/nix/persist/fhs".directories = [ ]; } diff --git a/spec/yume/default.nix b/spec/yume/default.nix index 3352e4e4..c3847fe8 100644 --- a/spec/yume/default.nix +++ b/spec/yume/default.nix @@ -14,7 +14,7 @@ }; home = { - plasma.enable = true; + gnome.enable = true; gyroflow.enable = true; jetbrains.enable = true; vscode.enable = true; @@ -23,27 +23,12 @@ steam.enable = true; }; - home.plasma.extraConfig = { - configFile = { - kscreenlockerrc.Daemon.Autolock = false; - kcminputrc."Libinput/16700/9486/Dell Computer Corp Dell Laser Mouse MS3220".NaturalScroll = true; - }; - }; - imports = lib.pipe ./. [ builtins.readDir (lib.filterAttrs (n: ty: ty == "regular" && n != "default.nix")) (lib.mapAttrsToList (n: _: ./${n})) ] ++ [ (modulesPath + "/profiles/qemu-guest.nix") ]; - # work around low cage resolution on pure nvidia - services.greetd.settings.default_session.command = let - cfg = config.programs.regreet; - in "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" '' - ${lib.getExe pkgs.wlr-randr} --output DP-2 --mode 1920x1080@60.000000Hz - ${lib.getExe cfg.package} - ''}"; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "usbhid" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; From d7e86b23aabfee3f2b7fbec737c79fc02dd35ebd Mon Sep 17 00:00:00 2001 From: 514fpv Date: Tue, 10 Sep 2024 22:53:05 +0800 Subject: [PATCH 31/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index af7876d4..44e292ea 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1724469296, - "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", + "lastModified": 1725509983, + "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", "owner": "catppuccin", "repo": "nix", - "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", + "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1724489415, - "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", + "lastModified": 1725690722, + "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", "owner": "nix-community", "repo": "impermanence", - "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", + "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1724837759, - "narHash": "sha256-gt1mCTlqnirTHAG8Q90IWEs91fRsTSjBqXhb6bQboe8=", + "lastModified": 1725944773, + "narHash": "sha256-MG/rHAx1soZTnuSrFsYLuSRzuQCUOXP8o7k8M0FzEd8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a679e3a0ef9d3d43639f7ba894069c43e2d39c2c", + "rev": "b9af8b3887f231334c1fae0efcb7be45096559e4", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1724556439, - "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", "type": "github" }, "original": { From 5ba7d045569032603e1123a97ad75342ee4b1310 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Fri, 13 Sep 2024 12:14:49 +0800 Subject: [PATCH 32/52] fix(gnome): update package --- home/gnome/impl/nixos.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index e95def1e..56835110 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -12,9 +12,9 @@ in mkIf cfg.enable { services.xserver.displayManager.startx.enable = false; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; - services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + services.udev.packages = with pkgs; [ gnome-settings-daemon ]; services.hardware.bolt.enable = true; - xdg.portal.configPackages = with pkgs; [ gnome.gnome-session ]; + xdg.portal.configPackages = with pkgs; [ gnome-session ]; hardware.pulseaudio.enable = false; environment.gnome.excludePackages = (with pkgs; [ From 992572be6bb58834d98ef6db8b357ef472e0773a Mon Sep 17 00:00:00 2001 From: 514fpv Date: Fri, 13 Sep 2024 12:28:17 +0800 Subject: [PATCH 33/52] chore(flake)!: bump inputs --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 44e292ea..d9f08260 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1725948275, - "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", + "lastModified": 1726142087, + "narHash": "sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", + "rev": "da8406a6ff556b86dc368e96ca8bd81b2704a91a", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1725944773, - "narHash": "sha256-MG/rHAx1soZTnuSrFsYLuSRzuQCUOXP8o7k8M0FzEd8=", + "lastModified": 1726115155, + "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b9af8b3887f231334c1fae0efcb7be45096559e4", + "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { From bc362174a9c16f6af18fee178e9642edbc432219 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Fri, 13 Sep 2024 12:32:12 +0800 Subject: [PATCH 34/52] fix(hakugyokurou): remove jovian mode --- spec/hakugyokurou/default.nix | 11 ---- spec/hakugyokurou/jovian.nix | 95 ----------------------------------- 2 files changed, 106 deletions(-) delete mode 100644 spec/hakugyokurou/jovian.nix diff --git a/spec/hakugyokurou/default.nix b/spec/hakugyokurou/default.nix index a2032d45..f1f9f285 100644 --- a/spec/hakugyokurou/default.nix +++ b/spec/hakugyokurou/default.nix @@ -44,19 +44,12 @@ DeviceScale=2 ''; - jovian.steamos.useSteamOSConfig = lib.mkDefault false; services.greetd.settings.default_session.command = let cfg = config.programs.regreet; in lib.mkOverride 999 "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" '' ${lib.getExe pkgs.wlr-randr} --output eDP-1 --scale 2 --transform 90 ${lib.getExe cfg.package} ''}"; - environment.systemPackages = with pkgs; [ - (writeShellScriptBin "sway-logout" '' - ${systemd}/bin/systemctl --user unset-environment WAYLAND_DISPLAY SWAYSOCK - ${sway}/bin/swaymsg exit - '') - ]; hardware.sensor.iio.enable = true; hardware.enableRedistributableFirmware = true; @@ -65,8 +58,4 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; hardware.cpu.intel.updateMicrocode = true; - - imports = [ - ./jovian.nix - ]; } diff --git a/spec/hakugyokurou/jovian.nix b/spec/hakugyokurou/jovian.nix deleted file mode 100644 index 68759ab7..00000000 --- a/spec/hakugyokurou/jovian.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ pkgs, lib, config, jovian, ... }: with lib; { - specialisation.steamos.configuration = { - jovian = { - hardware.has.amd.gpu = true; - steamos.useSteamOSConfig = true; - steamos.enableDefaultCmdlineConfig = false; - - steam = { - enable = true; - autoStart = true; - desktopSession = "plasma"; - user = "app"; - }; - }; - - users.home.persistApp.directories = [ - ".steam" ".local/share/Steam" - ".config/gamescope" ".config/hhd" - ".kodi" - ]; - - users.users.app.extraGroups = [ "networkmanager" "gamemode" ]; - programs.gamemode.enable = true; - programs.regreet.enable = false; - home.gnome.enable = mkForce false; - home.steam.enable = mkForce false; - home.plasma.enable = true; - home.plasma.extraConfig = { - configFile = { - kwinrc.Xwayland.Scale = 2; - kscreenlockerrc.Daemon.Autolock = false; - }; - }; - - home-manager.users.app = { - home.packages = with pkgs; [ - (pkgs.kodi-wayland.passthru.withPackages (kodiPkgs: with kodiPkgs; [ - joystick # keymap steam-controller - #controller-topology-project - libretro libretro-2048 - libretro-fuse libretro-genplus libretro-mgba - libretro-nestopia libretro-snes9x - jellycon - ])) - ]; - - home.pointerCursor = { - package = pkgs.steamdeck-hw-theme; - name = "steam"; - }; - }; - - services.handheld-daemon = { - enable = true; - user = "app"; - }; - - jovian.decky-loader = { - # ~/.steam/steam/.cef-enable-remote-debugging - enable = true; - user = "app"; - extraPackages = with pkgs; [ - curl unzip util-linux gnugrep procps pciutils kmod ryzenadj - ]; - extraPythonPackages = pythonPackages: with pythonPackages; [ - hid pyyaml - ]; - stateDir = "/nix/persist/decky"; - }; - - boot.kernelParams = [ - "iomem=relaxed" - "amd_pstate=passive" - ]; - boot.plymouth.themePackages = [ pkgs.steamdeck-hw-theme ]; - boot.plymouth.theme = "steamos"; - - services.udev.extraRules = '' - SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="${pkgs.ryzenadj}/bin/ryzenadj --max-performance" - ''; - - nixpkgs.overlays = [ (final: prev: { - gamescope = prev.gamescope.overrideAttrs (finalAttrs: previousAttrs: { - postInstall = previousAttrs.postInstall + "\n" + '' - wrapProgram "$out/bin/gamescope" \ - --append-flags "--force-orientation left" - ''; - }); - }) ]; - }; - - imports = [ - jovian.nixosModules.jovian - ]; -} From 0aa0a18058b4163d8dd2ff6738a0acc9274736aa Mon Sep 17 00:00:00 2001 From: 514fpv Date: Wed, 18 Sep 2024 19:23:46 +0800 Subject: [PATCH 35/52] chore(flake)!: bump inputs --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d9f08260..dd7d688d 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1726142087, - "narHash": "sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw=", + "lastModified": 1726611255, + "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "da8406a6ff556b86dc368e96ca8bd81b2704a91a", + "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1726115155, - "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", + "lastModified": 1726630303, + "narHash": "sha256-6xF6AqSGl/fNXeliuXAIOnEb4tMTUXOl1Yr1v4hURxg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", + "rev": "f7a1bb0db21db79dfbee6950220e2816330a08b1", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1725914634, - "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "lastModified": 1726509788, + "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", "type": "github" }, "original": { From cd4a5fcd0283c6f47cc7776c0b0b5f977d89e9cf Mon Sep 17 00:00:00 2001 From: 514fpv Date: Thu, 19 Sep 2024 09:25:48 +0800 Subject: [PATCH 36/52] fix(gnome): intellihide from focused windows --- home/gnome/impl/dconf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index 42c82ff2..b9d88c18 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -250,7 +250,7 @@ in mkIf cfg.enable { hide-overview-on-startup = true; hotkeys-overlay-combo = "TEMPORARILY"; intellihide = true; - intellihide-behaviour = "MAXIMIZED_WINDOWS"; + intellihide-behaviour = "FOCUSED_WINDOWS"; intellihide-hide-from-windows = true; isolate-workspaces = false; leftbox-padding = -1; From 900dd7f887a6ad1a9145c1e49ecdc6cb28c483b2 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 28 Sep 2024 16:52:28 +0800 Subject: [PATCH 37/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++-------------------- spec/eientei/tubesync.nix | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index dd7d688d..031b8512 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1725509983, - "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", + "lastModified": 1726952185, + "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", "owner": "catppuccin", "repo": "nix", - "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", + "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1726611255, - "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1725690722, - "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", + "lastModified": 1727198257, + "narHash": "sha256-/qMVI+SG9zvhLbQFOnqb4y4BH6DdK3DQHZU5qGptehc=", "owner": "nix-community", "repo": "impermanence", - "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", + "rev": "8514fff0f048557723021ffeb31ca55f69b67de3", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1726630303, - "narHash": "sha256-6xF6AqSGl/fNXeliuXAIOnEb4tMTUXOl1Yr1v4hURxg=", + "lastModified": 1727453186, + "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f7a1bb0db21db79dfbee6950220e2816330a08b1", + "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1726509788, - "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", + "lastModified": 1727463368, + "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", + "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", "type": "github" }, "original": { diff --git a/spec/eientei/tubesync.nix b/spec/eientei/tubesync.nix index f67b7e49..202dae12 100644 --- a/spec/eientei/tubesync.nix +++ b/spec/eientei/tubesync.nix @@ -1,6 +1,6 @@ { services.tubesync = { - enable = true; + enable = false; stateDir = "/nix/persist/service/tubesync"; }; From c5ee49c8c3a89cd16a9db7fff35a0486c0a37aeb Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 21 Oct 2024 20:48:04 +0800 Subject: [PATCH 38/52] feat(yume): enable android --- spec/yume/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/yume/default.nix b/spec/yume/default.nix index c3847fe8..1550ec16 100644 --- a/spec/yume/default.nix +++ b/spec/yume/default.nix @@ -11,6 +11,7 @@ boot.lanzaboote = true; gpu.enable = true; gpu.type = "nvidia"; + android.enable = true; }; home = { From ddfed88ec503810719caaa470afb6803f417877f Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 21 Oct 2024 20:48:13 +0800 Subject: [PATCH 39/52] chore(flake)!: bump inputs --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 031b8512..78b7ee52 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1727198257, - "narHash": "sha256-/qMVI+SG9zvhLbQFOnqb4y4BH6DdK3DQHZU5qGptehc=", + "lastModified": 1729068498, + "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=", "owner": "nix-community", "repo": "impermanence", - "rev": "8514fff0f048557723021ffeb31ca55f69b67de3", + "rev": "e337457502571b23e449bf42153d7faa10c0a562", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1729492135, + "narHash": "sha256-yXmCZaw0Pe4H9Xv3BDSoQdSulevJMH34XrtQD3v7aoY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "82bdda12079fbbe40cd1e26d3cbbf5093ea052c0", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1727463368, - "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", + "lastModified": 1729372184, + "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", + "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1", "type": "github" }, "original": { From 21bf4cbdb07499b1db8f08c7057491e774150787 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 21 Oct 2024 22:11:31 +0800 Subject: [PATCH 40/52] chore(eientei): nextcloud 29 -> 30 --- spec/eientei/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/eientei/nextcloud.nix b/spec/eientei/nextcloud.nix index 51af4cf0..23d1e678 100644 --- a/spec/eientei/nextcloud.nix +++ b/spec/eientei/nextcloud.nix @@ -4,9 +4,9 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; extraApps = { - inherit (pkgs.nextcloud29Packages.apps) + inherit (pkgs.nextcloud30Packages.apps) notify_push impersonate spreed contacts bookmarks deck polls notes forms twofactor_webauthn; From f63e2c30b5db53bafcfd5864ca8cc755c2c1f122 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Thu, 24 Oct 2024 15:08:00 +0800 Subject: [PATCH 41/52] chore(focus): nextcloud 29 -> 30 --- spec/focus/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/focus/nextcloud.nix b/spec/focus/nextcloud.nix index 6c9debc0..eabee803 100644 --- a/spec/focus/nextcloud.nix +++ b/spec/focus/nextcloud.nix @@ -4,9 +4,9 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; extraApps = { - inherit (pkgs.nextcloud29Packages.apps) + inherit (pkgs.nextcloud30Packages.apps) notify_push impersonate spreed contacts bookmarks deck polls notes forms twofactor_webauthn; From 55b1d8d596061155d7dfb8e220f4c76ec4f97db6 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 26 Oct 2024 01:01:06 +0800 Subject: [PATCH 42/52] feat(chireiden): enable gnome --- spec/chireiden/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/chireiden/default.nix b/spec/chireiden/default.nix index 4dd70842..f59fbf08 100644 --- a/spec/chireiden/default.nix +++ b/spec/chireiden/default.nix @@ -18,6 +18,7 @@ }; home = { + gnome.enable = true; vscode.enable = true; libreoffice.enable = true; minecraft.enable = true; From b9f9c0cf743d60078671edf79704a63a1d933053 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 26 Oct 2024 01:02:09 +0800 Subject: [PATCH 43/52] fix(zfs): split setup depend on secret mountpoint --- global/fs/zfs/split.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/fs/zfs/split.nix b/global/fs/zfs/split.nix index f49c2c09..22f9231f 100644 --- a/global/fs/zfs/split.nix +++ b/global/fs/zfs/split.nix @@ -31,5 +31,5 @@ in mkIf cfg.enable { }; # import system state pool after encrypted filesystems become available for key loading - boot.initrd.systemd.services."zfs-import-${config.global.fs.store}".after = [ "cryptsetup.target" ]; + boot.initrd.systemd.services."zfs-import-${config.global.fs.store}".after = [ "sysroot-nix-var-secret.mount" "cryptsetup.target" ]; } From c51c239c95cc78c5b37240fb62718df746c8ae2d Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 26 Oct 2024 01:14:54 +0800 Subject: [PATCH 44/52] chore(flake)!: bump inputs --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 78b7ee52..4831dd0e 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1729459288, - "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", + "lastModified": 1729864948, + "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", + "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729492135, - "narHash": "sha256-yXmCZaw0Pe4H9Xv3BDSoQdSulevJMH34XrtQD3v7aoY=", + "lastModified": 1729751760, + "narHash": "sha256-sJIYCzp0AyWeIFDUvrX8DpakEFIAnYgMQbIupqT0Um4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "82bdda12079fbbe40cd1e26d3cbbf5093ea052c0", + "rev": "899f84dd062dffc5dd912ba235e86be4855e5ffb", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1729372184, - "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=", + "lastModified": 1729710171, + "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1", + "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", "type": "github" }, "original": { From 9138eb110a8a5947d3631ec16a3625c14c983cfb Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 26 Oct 2024 01:33:16 +0800 Subject: [PATCH 45/52] chore(flake)!: bump inputs --- flake.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 4831dd0e..1fdde768 100644 --- a/flake.lock +++ b/flake.lock @@ -3,10 +3,10 @@ "catppuccin": { "locked": { "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "narHash": "sha256-iPrs6bLWdp7qdFRba2AfiHj604SpxC6AGASx7I692Lo=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "037e2f091a2144433566c5122f385a388cb5d5d3", "type": "github" }, "original": { From 28db6370ada05e608ea550fb9c007b88066e36d2 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Fri, 8 Nov 2024 14:54:30 +0800 Subject: [PATCH 46/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 1fdde768..5c681067 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-iPrs6bLWdp7qdFRba2AfiHj604SpxC6AGASx7I692Lo=", + "lastModified": 1730458408, + "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", "owner": "catppuccin", "repo": "nix", - "rev": "037e2f091a2144433566c5122f385a388cb5d5d3", + "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1729864948, - "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1729068498, - "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=", + "lastModified": 1730403150, + "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", "owner": "nix-community", "repo": "impermanence", - "rev": "e337457502571b23e449bf42153d7faa10c0a562", + "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729751760, - "narHash": "sha256-sJIYCzp0AyWeIFDUvrX8DpakEFIAnYgMQbIupqT0Um4=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "899f84dd062dffc5dd912ba235e86be4855e5ffb", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1729710171, - "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", + "lastModified": 1730635861, + "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", + "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", "type": "github" }, "original": { From f6b24828223463abeeda8e9f562ab7ac6cf513d9 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Thu, 14 Nov 2024 11:00:55 +0800 Subject: [PATCH 47/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 5c681067..b294ddd1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1731232837, + "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1730403150, - "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", + "lastModified": 1731242966, + "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", + "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730962714, - "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", + "lastModified": 1731227601, + "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "93b525229c99fec0016db72a174f43b9d6237714", + "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1730635861, - "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", + "lastModified": 1731193165, + "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", "owner": "pjones", "repo": "plasma-manager", - "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", + "rev": "f33173b9d22e554a6f869626bc01808d35995257", "type": "github" }, "original": { From 71e7a0e90bac9ffa8e321a592705756896324b57 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Fri, 22 Nov 2024 04:48:24 +0800 Subject: [PATCH 48/52] chore(flake)!: bump inputs --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b294ddd1..2314e68a 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731227601, - "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", + "lastModified": 1732032028, + "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", + "rev": "65dc04371cf914c9af4f073638821e4787303005", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { From 186c33373cbe62db899ae21b9cfa428964ba447e Mon Sep 17 00:00:00 2001 From: 514fpv Date: Fri, 22 Nov 2024 04:52:45 +0800 Subject: [PATCH 49/52] feat(shatter): initial configuration --- spec/shatter/default.nix | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 spec/shatter/default.nix diff --git a/spec/shatter/default.nix b/spec/shatter/default.nix new file mode 100644 index 00000000..9602114c --- /dev/null +++ b/spec/shatter/default.nix @@ -0,0 +1,34 @@ +{ lib +, pkgs +, ... }: { + global = { + id = "f16d3a87afdd4eb2b1fa4c098d4a9c1a"; + auth.openssh.enable = true; + fs.esp.uuid = "153D-AA49"; + fs.type = "xfs"; + fs.store = "67878f8f-3724-4551-a2e2-f43d674e1d93"; + fs.cryptsetup.enable = true; + fs.cryptsetup.uuids.persist = "3633e292-59e8-497d-9e51-0186ca73c25c"; + gpu.enable = true; + gpu.type = "intel"; + gpu.session = false; + boot.lanzaboote = true; + }; + + services.udev.extraRules = '' + SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="88:c9:b3:b5:15:0e", NAME="i225-v" + SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="8c:a6:82:70:08:ca", NAME="aqc113c" + ''; + boot.kernelParams = [ "zfs.zfs_arc_max=2147483648" ]; + networking.firewall.checkReversePath = false; + boot.swraid.enable = true; + boot.swraid.mdadmConf = '' + PROGRAM /run/current-system/sw/bin/true + ''; + + hardware.enableRedistributableFirmware = true; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "i915" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; +} From bc3d3e5423c2b3e7d3ef4f27c242bce5e4d5010a Mon Sep 17 00:00:00 2001 From: 514fpv Date: Tue, 26 Nov 2024 22:42:49 +0800 Subject: [PATCH 50/52] fix(gnome): link monitors.xml --- home/gnome/impl/home.nix | 7 +++++++ home/gnome/impl/nixos.nix | 2 -- home/profile.nix | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/home/gnome/impl/home.nix b/home/gnome/impl/home.nix index 8e034b20..ff5b9eba 100644 --- a/home/gnome/impl/home.nix +++ b/home/gnome/impl/home.nix @@ -22,4 +22,11 @@ in mkIf cfg.enable { catppuccin.enable = mkForce false; home.pointerCursor = mkForce null; gtk.enable = false; + + home.persistence."/nix/persist/home/${config.home.username}" = { + removePrefixDirectory = true; + files = [ + (if config.specialisation != {} then "gnome/.config/monitors.xml" else "extern/.config/monitors.xml") + ]; + }; } diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index 56835110..e49c6ad2 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -46,6 +46,4 @@ in mkIf cfg.enable { ]); users.home.persist.directories = [ ".config/dconf" ]; - users.home.persist.files = [ ".config/monitors.xml" ]; - environment.persistence."/nix/persist/fhs".directories = [ ]; } diff --git a/home/profile.nix b/home/profile.nix index 6cf374df..ee64c439 100644 --- a/home/profile.nix +++ b/home/profile.nix @@ -139,6 +139,7 @@ in { home-manager.users = mapAttrs (name: opts: { imports = with inputs; cfg.homeModules ++ [ + impermanence.homeManagerModules.impermanence catppuccin.homeManagerModules.catppuccin ]; home.file.".face" = mkIf (opts.picture != null) { From 2cf696e9ef76447cf1a2f0f78b3b6792334af0a1 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 14 Dec 2024 17:47:10 +0800 Subject: [PATCH 51/52] feat(eientei): add minecraft greedycraft instance --- spec/eientei/minecraft.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/eientei/minecraft.nix b/spec/eientei/minecraft.nix index a9b88b9f..a18a5e6b 100644 --- a/spec/eientei/minecraft.nix +++ b/spec/eientei/minecraft.nix @@ -12,6 +12,11 @@ # stop = "stop"; #}; + greedycraft = { + cmdline = "${pkgs.jdk8}/bin/java -Xmx10G -Xms10G -Xss4M -Dfile.encoding=GBK -Dsun.rmi.dgc.server.gcInterval=1800000 -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:+AlwaysPreTouch -XX:+UseStringDeduplication -Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true -XX:-OmitStackTraceInFastThrow -XX:+OptimizeStringConcat -XX:+UseAdaptiveGCBoundary -XX:G1HeapRegionSize=32M -jar forge-1.12.2-14.23.5.2855.jar nogui"; + stop = "stop"; + }; + nfwc = { cmdline = "${pkgs.jdk}/bin/java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.19.2-43.3.8/unix_args.txt"; stop = "stop"; From 7431c6079af98201d2d5682223aafdd896d5b1ca Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sat, 14 Dec 2024 17:58:40 +0800 Subject: [PATCH 52/52] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 2314e68a..a38f2578 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1731232837, - "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", + "lastModified": 1734057772, + "narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=", "owner": "catppuccin", "repo": "nix", - "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", + "rev": "20b6328df20ae45752c81311d225fd47cba32483", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732032028, - "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", + "lastModified": 1734162608, + "narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "65dc04371cf914c9af4f073638821e4787303005", + "rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1731193165, - "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", + "lastModified": 1733858086, + "narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f33173b9d22e554a6f869626bc01808d35995257", + "rev": "7e2010249529931a3848054d5ff0dbf24675ab68", "type": "github" }, "original": {