diff --git a/modules/configuration.nix b/modules/configuration.nix index 372cc26..591588e 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -12,34 +12,6 @@ { inputs, config, pkgs, lib, username, host, version, system, ... }: { - stylix = { - enable = false; - image = ../other/wallpaper2.png; - #autoEnable = true; #Auto generate theme based on wallpaper - base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-moon.yaml"; - opacity = { - desktop = 0.5; - terminal = 0.9; - }; - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrainsMono Nerd Font"; - }; - - sansSerif = { - package = pkgs.inter; - name = "Inter"; - }; - - serif = { - package = pkgs.noto-fonts; - name = "Noto Serif"; - }; - }; - targets.grub.enable = false; - }; - # in configuration.nix #Assign Swap to the PC #swapDevices = [{ @@ -52,7 +24,6 @@ inputs.home-manager.nixosModules.home-manager inputs.grub2-themes.nixosModules.default inputs.nix-flatpak.nixosModules.nix-flatpak - inputs.stylix.nixosModules.stylix ./hardware-configuration.nix ./firefox.nix diff --git a/modules/default.nix b/modules/default.nix index d5355a5..06ff491 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,9 +9,9 @@ #./packages.nix #./hardware-configuration.nix - ../plasma/plasma.nix - ../hyprland/hyprland.nix - ../niri/niri.nix + #../plasma/plasma.nix + #../hyprland/hyprland.nix + #../niri/niri.nix ]; specialisation = { diff --git a/modules/home.nix b/modules/home.nix index fd5d968..ef2e531 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -35,9 +35,9 @@ enable = true; settings = { #Disabled Because of stylix - background_opacity = "0.2"; #The higher the value, the darker the console + background_opacity = lib.mkForce "0.2"; #The higher the value, the darker the console - background_blur = 10; + background_blur = lib.mkForce 10; }; }; diff --git a/modules/ncli.nix b/modules/ncli.nix index f133621..8541643 100644 --- a/modules/ncli.nix +++ b/modules/ncli.nix @@ -125,7 +125,8 @@ in ;; rebuild) handle_backups - echo "Starting NixOS rebuild for current host: $HOST" + geno=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | grep current | awk '{print $1}') + echo "Starting NixOS rebuild for current host: $HOST on generation: $geno" cd "$HOME/$PROJECT" || { echo "Error: Could not change to $HOME/$PROJECT"; exit 1; } current="" @@ -133,14 +134,17 @@ in current=$(cat /etc/nixos-tags) fi - if sudo nixos-rebuild switch --flake ".#$HOST"; then + if sudo nixos-rebuild switch --flake .; then echo "✓ Rebuild finished successfully for $HOST" if [ -n "$current" ]; then - sudo /run/current-system/specialisation/$current/bin/switch-to-configuration switch + sudo /run/current-system/specialisation/$current/bin/switch-to-configuration test else echo "No specialization tag found, staying on default system." fi + + genn=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | grep current | awk '{print $1}') + echo "Running on new generation: $geno -> $genn" else echo "✗ Rebuild failed for $HOST" >&2 @@ -149,7 +153,8 @@ in ;; update) handle_backups - echo "Updating flake and rebuilding system for current host: $HOST" + geno=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | grep current | awk '{print $1}') + echo "Updating flake and rebuilding system for current host: $HOST on generation: $geno" cd "$HOME/$PROJECT" || { echo "Error: Could not change to $HOME/$PROJECT"; exit 1; } echo "Updating flake..." @@ -172,7 +177,7 @@ in echo "Rebuilding system... Staying on current specialization" fi - if sudo nixos-rebuild switch --flake ".#$HOST"; then + if sudo nixos-rebuild switch --flake .; then echo "✓ Update and rebuild finished successfully for $HOST" if [ -n "$current" ]; then @@ -181,6 +186,9 @@ in echo "No specialization tag found, staying on default system." fi + genn=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | grep current | awk '{print $1}') + echo "Running on new generation: $geno -> $genn" + else echo "✗ Update and rebuild failed for $HOST" >&2 exit 1 diff --git a/modules/packages.nix b/modules/packages.nix index 6ac915b..54d772f 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -34,6 +34,7 @@ plymouth mesa fprintd + nh #Programming #jetbrains.pycharm-community #The PyCharm IDE to edit Python code @@ -79,7 +80,6 @@ kdePackages.bluez-qt moonlight-qt kitty - tdrop wmctrl #To Force windows into fullscreen kdePackages.dolphin persepolis #Download Manager diff --git a/modules/stylix.nix b/modules/stylix.nix new file mode 100644 index 0000000..6c1e5a9 --- /dev/null +++ b/modules/stylix.nix @@ -0,0 +1,36 @@ +{ pkgs, inputs, ... }: +{ + + imports = + [ + inputs.stylix.nixosModules.stylix + ]; + + stylix = { + enable = true; + image = ../other/wallpaper2.png; + #autoEnable = true; #Auto generate theme based on wallpaper + base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-moon.yaml"; + opacity = { + desktop = 0.5; + terminal = 0.9; + }; + fonts = { + monospace = { + package = pkgs.nerd-fonts.jetbrains-mono; + name = "JetBrainsMono Nerd Font"; + }; + + sansSerif = { + package = pkgs.inter; + name = "Inter"; + }; + + serif = { + package = pkgs.noto-fonts; + name = "Noto Serif"; + }; + }; + targets.grub.enable = false; + }; +} diff --git a/niri/home.nix b/niri/home.nix index 4f55048..11d56e3 100644 --- a/niri/home.nix +++ b/niri/home.nix @@ -9,17 +9,642 @@ package = pkgs.niri; enable = true; #xwayland.enable = true; +# config = '' +# binds { +# Super+Return { spawn "kitty"; } +# Super+Space { spawn "fuzzel"; } +# Super+Q { close-window; } +# Super+Left { focus-column-left; } +# Super+Right { focus-column-right; } +# Super+Up { focus-workspace-up; } +# Super+Down { focus-workspace-down; } +# Super+L { spawn "hyprlock"; } +# Super+Shift+E { "quit"; } +# } +# ''; config = '' + // This config is in the KDL format: https://kdl.dev + // "/-" comments out the following node. + // Check the wiki for a full description of the configuration: + // https://yalter.github.io/niri/Configuration:-Introduction + + // Input device configuration. + // Find the full list of options on the wiki: + // https://yalter.github.io/niri/Configuration:-Input + input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + // layout "us,ru" + // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + + // If this section is empty, niri will fetch xkb settings + // from org.freedesktop.locale1. You can control these using + // localectl set-x11-keymap. + } + + // Enable numlock on startup, omitting this setting disables it. + numlock + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + // All commented-out settings here are examples, not defaults. + touchpad { + // off + tap + // dwt + // dwtp + // drag false + // drag-lock + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "no-scroll" + } + + trackpoint { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "on-button-down" + // scroll-button 273 + // scroll-button-lock + // middle-emulation + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + // warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. + // focus-follows-mouse max-scroll-amount="0%" + } + + // You can configure outputs by their name, which you can find + // by running `niri msg outputs` while inside a niri instance. + // The built-in laptop monitor is usually called "eDP-1". + // Find more information on the wiki: + // https://yalter.github.io/niri/Configuration:-Outputs + // Remember to uncomment the node by removing "/-"! + /-output "eDP-1" { + // Uncomment this line to disable this output. + // off + + // Resolution and, optionally, refresh rate of the output. + // The format is "x" or "x@". + // If the refresh rate is omitted, niri will pick the highest refresh rate + // for the resolution. + // If the mode is omitted altogether or is invalid, niri will pick one automatically. + // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. + mode "1920x1080@120.030" + + // You can use integer or fractional scale, for example use 1.5 for 150% scale. + scale 2 + + // Transform allows to rotate the output counter-clockwise, valid values are: + // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. + transform "normal" + + // Position of the output in the global coordinate space. + // This affects directional monitor actions like "focus-monitor-left", and cursor movement. + // The cursor can only move between directly adjacent outputs. + // Output scale and rotation has to be taken into account for positioning: + // outputs are sized in logical, or scaled, pixels. + // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, + // so to put another output directly adjacent to it on the right, set its x to 1920. + // If the position is unset or results in an overlap, the output is instead placed + // automatically. + position x=1280 y=0 + } + + // Settings that influence how windows are positioned and sized. + // Find more information on the wiki: + // https://yalter.github.io/niri/Configuration:-Layout + layout { + // Set gaps around windows in logical pixels. + gaps 16 + + // When to center a column when changing focus, options are: + // - "never", default behavior, focusing an off-screen column will keep at the left + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. + // preset-window-heights { } + + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + + // You can change how the focus ring looks. + focus-ring { + // Uncomment this line to disable the focus ring. + // off + + // How many logical pixels the ring extends out from the windows. + width 4 + + // Colors can be set in a variety of ways: + // - CSS named colors: "red" + // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" + // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + + // Color of the ring on the active monitor. + active-color "#7fc8ff" + + // Color of the ring on inactive monitors. + // + // The focus ring only draws around the active window, so the only place + // where you can see its inactive-color is on other monitors. + inactive-color "#505050" + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // Changing the color space is also supported, check the wiki for more info. + // + // active-gradient from="#80c8ff" to="#c7ff7f" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can also add a border. It's similar to the focus ring, but always visible. + border { + // The settings are the same as for the focus ring. + // If you enable the border, you probably want to disable the focus ring. + off + + width 4 + active-color "#ffc87f" + inactive-color "#505050" + + // Color of the border around windows that request your attention. + urgent-color "#9b0000" + + // Gradients can use a few different interpolation color spaces. + // For example, this is a pastel rainbow gradient via in="oklch longer hue". + // + // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue" + + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can enable drop shadows for windows. + shadow { + // Uncomment the next line to enable shadows. + // on + + // By default, the shadow draws only around its window, and not behind it. + // Uncomment this setting to make the shadow draw behind its window. + // + // Note that niri has no way of knowing about the CSD window corner + // radius. It has to assume that windows have square corners, leading to + // shadow artifacts inside the CSD rounded corners. This setting fixes + // those artifacts. + // + // However, instead you may want to set prefer-no-csd and/or + // geometry-corner-radius. Then, niri will know the corner radius and + // draw the shadow correctly, without having to draw it behind the + // window. These will also remove client-side shadows if the window + // draws any. + // + // draw-behind-window true + + // You can change how shadows look. The values below are in logical + // pixels and match the CSS box-shadow properties. + + // Softness controls the shadow blur radius. + softness 30 + + // Spread expands the shadow. + spread 5 + + // Offset moves the shadow relative to the window. + offset x=0 y=5 + + // You can also change the shadow color and opacity. + color "#0007" + } + + // Struts shrink the area occupied by windows, similarly to layer-shell panels. + // You can think of them as a kind of outer gaps. They are set in logical pixels. + // Left and right struts will cause the next window to the side to always be visible. + // Top and bottom struts will simply add outer gaps in addition to the area occupied by + // layer-shell panels and regular gaps. + struts { + // left 64 + // right 64 + // top 64 + // bottom 64 + } + } + + // Add lines like this to spawn processes at startup. + // Note that running niri as a session supports xdg-desktop-autostart, + // which may be more convenient to use. + // See the binds section below for more spawn examples. + + // This line starts waybar, a commonly used bar for Wayland compositors. + spawn-at-startup "waybar" + + // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: + // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" + + hotkey-overlay { + // Uncomment this line to disable the "Important Hotkeys" pop-up at startup. + // skip-at-startup + } + + // Uncomment this line to ask the clients to omit their client-side decorations if possible. + // If the client will specifically ask for CSD, the request will be honored. + // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. + // This option will also fix border/focus ring drawing behind some semitransparent windows. + // After enabling or disabling this, you need to restart the apps for this to take effect. + // prefer-no-csd + + // You can change the path where screenshots are saved. + // A ~ at the front will be expanded to the home directory. + // The path is formatted with strftime(3) to give you the screenshot date and time. + screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + + // You can also set this to null to disable saving screenshots to disk. + // screenshot-path null + + // Animation settings. + // The wiki explains how to configure individual animations: + // https://yalter.github.io/niri/Configuration:-Animations + animations { + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + // slowdown 3.0 + } + + // Window rules let you adjust behavior for individual windows. + // Find more information on the wiki: + // https://yalter.github.io/niri/Configuration:-Window-Rules + + // Work around WezTerm's initial configure bug + // by setting an empty default-column-width. + window-rule { + // This regular expression is intentionally made as specific as possible, + // since this is the default config, and we want no false positives. + // You can get away with just app-id="wezterm" if you want. + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} + } + + // Open the Firefox picture-in-picture player as floating by default. + window-rule { + // This app-id regular expression will work for both: + // - host Firefox (app-id is "firefox") + // - Flatpak Firefox (app-id is "org.mozilla.firefox") + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + open-floating true + } + + // Example: block out two password managers from screen capture. + // (This example rule is commented out with a "/-" in front.) + /-window-rule { + match app-id=r#"^org\.keepassxc\.KeePassXC$"# + match app-id=r#"^org\.gnome\.World\.Secrets$"# + + block-out-from "screen-capture" + + // Use this instead if you want them visible on third-party screenshot tools. + // block-out-from "screencast" + } + + // Example: enable rounded corners for all windows. + // (This example rule is commented out with a "/-" in front.) + /-window-rule { + geometry-corner-radius 12 + clip-to-geometry true + } + binds { - Super+Return { spawn "kitty"; } - Super+Space { spawn "fuzzel"; } - Super+Q { close-window; } - Super+Left { focus-column-left; } - Super+Right { focus-column-right; } - Super+Up { focus-workspace-up; } - Super+Down { focus-workspace-down; } - Super+L { spawn "hyprlock"; } - Super+Shift+E { "quit"; } + // Keys consist of modifiers separated by + signs, followed by an XKB key name + // in the end. To find an XKB name for a particular key, you may use a program + // like wev. + // + // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt + // when running as a winit window. + // + // Most actions that you can bind here can also be invoked programmatically with + // `niri msg action do-something`. + + // Mod-Shift-/, which is usually the same as Mod-?, + // shows a list of important hotkeys. + Mod+Shift+Slash { show-hotkey-overlay; } + + // Suggested binds for running programs: terminal, app launcher, screen locker. + Mod+T hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } + Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; } + Super+Alt+L hotkey-overlay-title="Lock the Screen: hyprlock" { spawn "hyrplock"; } + + // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. + // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. + // For example, this is a standard bind to toggle the screen reader (orca). + Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + // Using spawn-sh allows to pass multiple arguments together with the command. + // "-l 1.0" limits the volume to 100%. + XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; } + XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; } + XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } + + // Example media keys mapping using playerctl. + // This will work with any MPRIS-enabled media player. + XF86AudioPlay allow-when-locked=true { spawn-sh "playerctl play-pause"; } + XF86AudioStop allow-when-locked=true { spawn-sh "playerctl stop"; } + XF86AudioPrev allow-when-locked=true { spawn-sh "playerctl previous"; } + XF86AudioNext allow-when-locked=true { spawn-sh "playerctl next"; } + + // Example brightness key mappings for brightnessctl. + // You can use regular spawn with multiple arguments too (to avoid going through "sh"), + // but you need to manually put each argument in separate "" quotes. + XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } + + // Open/close the Overview: a zoomed-out view of workspaces and windows. + // You can also move the mouse into the top-left hot corner, + // or do a four-finger swipe up on a touchpad. + Mod+O repeat=false { toggle-overview; } + + Mod+Q repeat=false { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down; } + Mod+Ctrl+Up { move-window-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down; } + Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+L { move-column-right; } + + // Alternative commands that move across workspaces when reaching + // the first or last window in a column. + // Mod+J { focus-window-or-workspace-down; } + // Mod+K { focus-window-or-workspace-up; } + // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + Mod+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+H { focus-monitor-left; } + Mod+Shift+J { focus-monitor-down; } + Mod+Shift+K { focus-monitor-up; } + Mod+Shift+L { focus-monitor-right; } + + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // Alternatively, there are commands to move just a single window: + // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } + // ... + + // And you can also move a whole workspace to another monitor: + // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } + // ... + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } + // ... + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // You can bind mouse wheel scroll ticks using the following syntax. + // These binds will change direction based on the natural-scroll setting. + // + // To avoid scrolling through workspaces really fast, you can use + // the cooldown-ms property. The bind will be rate-limited to this value. + // You can set a cooldown on any bind, but it's most useful for the wheel. + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // Similarly, you can bind touchpad scroll "ticks". + // Touchpad scrolling is continuous, so for these binds it is split into + // discrete intervals. + // These binds are also affected by touchpad's natural-scroll, so these + // example binds are "inverted", since we have natural-scroll enabled for + // touchpads by default. + // Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; } + // Mod+TouchpadScrollUp { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; } + + // You can refer to workspaces by index. However, keep in mind that + // niri is a dynamic workspace system, so these commands are kind of + // "best effort". Trying to refer to a workspace index bigger than + // the current workspace count will instead refer to the bottommost + // (empty) workspace. + // + // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on + // will all refer to the 3rd workspace. + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+1 { move-column-to-workspace 1; } + Mod+Ctrl+2 { move-column-to-workspace 2; } + Mod+Ctrl+3 { move-column-to-workspace 3; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+1 { move-window-to-workspace 1; } + + // Switches focus between the current and the previous workspace. + // Mod+Tab { focus-workspace-previous; } + + // The following binds move the focused window in and out of a column. + // If the window is alone, they will consume it into the nearby column to the side. + // If the window is already in a column, they will expel it out. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + // Consume one window from the right to the bottom of the focused column. + Mod+Comma { consume-window-into-column; } + // Expel the bottom window from the focused column to the right. + Mod+Period { expel-window-from-column; } + + Mod+R { switch-preset-column-width; } + // Cycling through the presets in reverse order is also possible. + // Mod+R { switch-preset-column-width-back; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + + // Expand the focused column to space not taken up by other fully visible columns. + // Makes the column "fill the rest of the space". + Mod+Ctrl+F { expand-column-to-available-width; } + + Mod+C { center-column; } + + // Center all fully visible columns on screen. + Mod+Ctrl+C { center-visible-columns; } + + // Finer width adjustments. + // This command can also: + // * set width in pixels: "1000" + // * adjust width in pixels: "-5" or "+5" + // * set width as a percentage of screen width: "25%" + // * adjust width as a percentage of screen width: "-10%" or "+10%" + // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, + // set-column-width "100" will make the column occupy 200 physical screen pixels. + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + // Finer height adjustments when in column with other windows. + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // Move the focused window between the floating and the tiling layout. + Mod+V { toggle-window-floating; } + Mod+Shift+V { switch-focus-between-floating-and-tiling; } + + // Toggle tabbed column display mode. + // Windows in this column will appear as vertical tabs, + // rather than stacked on top of each other. + Mod+W { toggle-column-tabbed-display; } + + // Actions to switch layouts. + // Note: if you uncomment these, make sure you do NOT have + // a matching layout switch hotkey configured in xkb options above. + // Having both at once on the same hotkey will break the switching, + // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). + // Mod+Space { switch-layout "next"; } + // Mod+Shift+Space { switch-layout "prev"; } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + + // Applications such as remote-desktop clients and software KVM switches may + // request that niri stops processing the keyboard shortcuts defined here + // so they may, for example, forward the key presses as-is to a remote machine. + // It's a good idea to bind an escape hatch to toggle the inhibitor, + // so a buggy application can't hold your session hostage. + // + // The allow-inhibiting=false property can be applied to other binds as well, + // which ensures niri always processes them, even when an inhibitor is active. + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { quit; } + Ctrl+Alt+Delete { quit; } + + // Powers off the monitors. To turn them back on, do any input like + // moving the mouse or pressing any other key. + Mod+Shift+P { power-off-monitors; } } ''; }; diff --git a/niri/niri.nix b/niri/niri.nix index 07b6099..f960132 100644 --- a/niri/niri.nix +++ b/niri/niri.nix @@ -5,6 +5,7 @@ ../modules/noctalia ../modules/hyprlock ../modules/hyprpaper + ../modules/stylix.nix ]; home-manager.sharedModules = [ diff --git a/other/aliases b/other/aliases index e251dae..12ade40 100644 --- a/other/aliases +++ b/other/aliases @@ -11,7 +11,7 @@ alias py="python3" #alias mcrow="sudo micro" alias mcrow="echo 'you better try to use nvim you little shit! :3'" -alias srcals="source $HOME/other/aliases && echo 'Sourced Aliases ... successful!'" +alias srcals="source $HOME/NixOS/other/aliases && echo 'Sourced Aliases ... successful!'" alias please="sudo" alias se="sudoedit" alias tt="gtypist ktde.typ" @@ -45,7 +45,7 @@ alias nix-clear="sudo nix-store --gc" #KDE Plasma Specific #----- -alias kde-theme-apply="source $HOME/nixos/plasma/konsave.sh" +alias kde-theme-apply="source $HOME/NixOS/plasma/konsave.sh" #Hyprland Specific #----- diff --git a/plasma/autostart.nix b/plasma/autostart.nix index 5f0e54a..3bdef6b 100644 --- a/plasma/autostart.nix +++ b/plasma/autostart.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, username, ... }: { #To show logs of services run: journalctl --user-unit={service-name} --user @@ -9,7 +9,7 @@ #after = [ "plasma-desktop.service" ]; wantedBy = [ "graphical-session.target" ]; serviceConfig = { - ExecStart = [ "/run/current-system/sw/bin/plasma-apply-wallpaperimage /etc/nixos/other/wallpaper2.png" ]; + ExecStart = [ "/run/current-system/sw/bin/plasma-apply-wallpaperimage /home/${username}/NixOS/other/wallpaper2.png" ]; Type = "oneshot"; Restart = "on-failure"; diff --git a/plasma/home.nix b/plasma/home.nix index e20913c..3d9e058 100644 --- a/plasma/home.nix +++ b/plasma/home.nix @@ -11,20 +11,22 @@ panels = [ { - height = 38; + height = 44; location = "top"; alignment = "center"; floating = true; opacity = "translucent"; widgets = [ "org.kde.plasma.kickoff" + "org.kde.plasma.pager" "org.kde.plasma.panelspacer" "org.kde.plasma.systemmonitor.cpu" + "org.kde.plasma.systemtray" "org.kde.plasma.digitalclock" ]; } { - height = 65; + height = 60; location = "bottom"; alignment = "center"; lengthMode = "fit"; @@ -45,6 +47,7 @@ }; }; } + ]; } ]; diff --git a/plasma/plasma.nix b/plasma/plasma.nix index 9c58e37..d7de4b8 100644 --- a/plasma/plasma.nix +++ b/plasma/plasma.nix @@ -6,7 +6,7 @@ ]; home-manager.sharedModules = [ - #./home.nix + ./home.nix ]; systemd.services = {