From f546ca5a0c741e1caf3465d7170b46eee6b29a91 Mon Sep 17 00:00:00 2001 From: Grey Jones Date: Sun, 6 Sep 2026 18:57:00 +0100 Subject: [PATCH] change some niri config, add setup script for nobara on PC --- dotfiles/kitagawa/niri.kdl | 6 ++++- dotfiles/shared/niri-shared.kdl | 9 +++---- .../takamaki/equibop/equicord-settings.json | 2 +- dotfiles/takamaki/niri.kdl | 4 ++- modules/capabilities/graphics.nix | 24 +++++++++++------ modules/features/shells/zsh.nix | 2 -- modules/hosts/kitagawa/kitagawa.nix | 8 +----- modules/hosts/takamaki/system/setup.sh | 27 +++++++++++++++++++ modules/hosts/takamaki/takamaki.nix | 6 +---- 9 files changed, 58 insertions(+), 30 deletions(-) create mode 100755 modules/hosts/takamaki/system/setup.sh diff --git a/dotfiles/kitagawa/niri.kdl b/dotfiles/kitagawa/niri.kdl index a0610c5..75d7b3e 100644 --- a/dotfiles/kitagawa/niri.kdl +++ b/dotfiles/kitagawa/niri.kdl @@ -1,3 +1,5 @@ +include "./shared.kdl" + input { keyboard { repeat-delay 600 @@ -63,4 +65,6 @@ window-rule { } switch-events { lid-close { spawn "systemctl hibernate"; } -} \ No newline at end of file +} + +include "noctalia.kdl" diff --git a/dotfiles/shared/niri-shared.kdl b/dotfiles/shared/niri-shared.kdl index e0f1b10..7710439 100644 --- a/dotfiles/shared/niri-shared.kdl +++ b/dotfiles/shared/niri-shared.kdl @@ -1,5 +1,3 @@ -include "./noctalia.kdl" - input { keyboard { xkb { @@ -55,6 +53,7 @@ binds { Mod+Shift+P hotkey-overlay-title="Open power menu" { spawn "noctalia" "msg" "panel-toggle" "session"; } Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; } Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; } + Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; } Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; } Mod+Up { focus-workspace-up; } @@ -125,7 +124,7 @@ animations { on slowdown 1 workspace-switch { - spring damping-ratio=0.9 stiffness=750 epsilon=0.0001 + spring damping-ratio=0.9 stiffness=650 epsilon=0.0001 } window-open { duration-ms 100 @@ -136,12 +135,12 @@ animations { curve "ease-out-quad" } horizontal-view-movement { - spring damping-ratio=0.85 stiffness=850 epsilon=0.0001 + spring damping-ratio=0.95 stiffness=750 epsilon=0.0001 } window-movement { spring damping-ratio=0.9 stiffness=750 epsilon=0.0001 } window-resize { - spring damping-ratio=0.8 stiffness=650 epsilon=0.0001 + spring damping-ratio=0.75 stiffness=700 epsilon=0.0001 } } \ No newline at end of file diff --git a/dotfiles/takamaki/equibop/equicord-settings.json b/dotfiles/takamaki/equibop/equicord-settings.json index fdae3b8..792804d 100755 --- a/dotfiles/takamaki/equibop/equicord-settings.json +++ b/dotfiles/takamaki/equibop/equicord-settings.json @@ -4,7 +4,7 @@ "authenticated": false, "settingsSync": false, "url": "https://cloud.equicord.org/", - "settingsSyncVersion": 1788650476307 + "settingsSyncVersion": 1788703728040 }, "enableOnlineThemes": true, "enabledThemeLinks": [ diff --git a/dotfiles/takamaki/niri.kdl b/dotfiles/takamaki/niri.kdl index 33f0e6c..0b8dfdf 100644 --- a/dotfiles/takamaki/niri.kdl +++ b/dotfiles/takamaki/niri.kdl @@ -105,4 +105,6 @@ window-rule { window-rule { match app-id="^org\\.prismlauncher\\.PrismLauncher$" default-window-height { fixed 750; } -} \ No newline at end of file +} + +include "noctalia.kdl" diff --git a/modules/capabilities/graphics.nix b/modules/capabilities/graphics.nix index 0981305..bac6f0f 100644 --- a/modules/capabilities/graphics.nix +++ b/modules/capabilities/graphics.nix @@ -1,4 +1,16 @@ -{ inputs, self, ... }: { +{ inputs, self, ... }: let + extraPackages = pkgs: with pkgs; [ + x264 + gparted + vlc + obsidian + proton-vpn + ente-auth + signal-desktop + github-desktop + kdePackages.filelight + ]; +in { flake.nixosModules.graphics = { pkgs, ... }: { imports = [ self.nixosModules.graphicsOptions ]; @@ -6,7 +18,7 @@ wayland-utils mesa-demos vulkan-tools - ]; + ] ++ (if !config.features.nixos.home-manager.enable then (extraPackages pkgs) else []); fonts.packages = with pkgs; [ iosevka-comfy.comfy @@ -17,14 +29,10 @@ flake.homeModules.graphics = { config, pkgs, ... }: { imports = [ self.homeModules.graphicsOptions ]; - home.packages = with pkgs; [ - bibata-cursors - x264 - gparted - vlc + home.packages = (extraPackages pkgs) ++ (if config.info.isStandalone then (with pkgs; [ iosevka-comfy.comfy nerd-fonts.jetbrains-mono - ]; + ]) else []); dconf.settings = { "org/gnome/desktop/interface" = { diff --git a/modules/features/shells/zsh.nix b/modules/features/shells/zsh.nix index 3fa5d91..6fb30ff 100644 --- a/modules/features/shells/zsh.nix +++ b/modules/features/shells/zsh.nix @@ -8,8 +8,6 @@ flake.nixosModules.global = { config, pkgs, lib, ... }: { config = lib.mkIf (config.features.shells.zsh.enable || config.features.shells.defaultShell == "zsh") { - programs.zsh.enable = true; - home-manager.users.${config.info.userName} = lib.mkIf (config.features.nixos.home-manager.enable) { features.shells.zsh.enable = lib.mkDefault true; features.shells.zsh.antidote.enable = lib.mkDefault config.features.shells.zsh.antidote.enable; diff --git a/modules/hosts/kitagawa/kitagawa.nix b/modules/hosts/kitagawa/kitagawa.nix index da09f5d..98f4c3f 100644 --- a/modules/hosts/kitagawa/kitagawa.nix +++ b/modules/hosts/kitagawa/kitagawa.nix @@ -40,6 +40,7 @@ enable = true; spicetify.enable = true; }; + thunderbird.enable = true; }; cli = { @@ -48,7 +49,6 @@ }; extraPackages = with pkgs; [ - github-desktop moonlight-qt ]; }; @@ -99,15 +99,9 @@ features = { applications = { extraPackages = with pkgs; [ - obsidian - thunderbird jetbrains.clion jetbrains.idea - proton-vpn - ente-auth - signal-desktop xarchiver - kdePackages.filelight kdePackages.kate loupe sshfs diff --git a/modules/hosts/takamaki/system/setup.sh b/modules/hosts/takamaki/system/setup.sh new file mode 100755 index 0000000..3533641 --- /dev/null +++ b/modules/hosts/takamaki/system/setup.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +nobara-sync cli + +# niri build dependencies +sudo dnf install git cargo gcc libudev-devel libgbm-devel libxkbcommon-devel wayland-devel libinput-devel dbus-devel systemd-devel libseat-devel pipewire-devel pango-devel cairo-gobject-devel clang libdisplay-info-devel -y +cargo install -f cargo-generate-rpm + +# build niri (biri fork) +cd ~/Documents +git clone https://github.com/barrulus/biri +cd biri +cargo build --release +cargo generate-rpm + +RPM_FILE=$(ls ./target/generate-rpm) +sudo dnf install ./target/generate-rpm/$RPM_FILE -y + +# other system applications that are NOT handled by nix+home-manager +sudo dnf install noctalia steam goverlay protonplus prismlauncher obs-studio mangohud -y + +# activate home-manger config +sudo dnf install nix -y +nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager +nix-channel --update +nix-shell '' -A install +home-manager switch --flake ~/flake diff --git a/modules/hosts/takamaki/takamaki.nix b/modules/hosts/takamaki/takamaki.nix index fd68ac7..d506ab6 100644 --- a/modules/hosts/takamaki/takamaki.nix +++ b/modules/hosts/takamaki/takamaki.nix @@ -67,15 +67,11 @@ theme = "comfy"; }; }; - thunderbird = { - enable = true; - }; + thunderbird.enable = true; }; extraPackages = with pkgs; [ nix-init - github-desktop - signal-desktop ]; shellScripts = let