From dd6e309f1f1c645045d7d818145232b522ffd06f Mon Sep 17 00:00:00 2001 From: serenity-F Date: Tue, 30 Dec 2025 23:12:55 +1000 Subject: [PATCH] tidying code --- flake.nix | 15 +- home/default.nix | 2 +- home/desktop/default.nix | 4 +- home/desktop/niri/niri.kdl | 584 ------------------ home/desktop/{ => sway}/sway.nix | 0 home/desktop/{ => sway}/swayfx.nix | 0 .../music-production.nix} | 0 .../default.nix => multimedia/music.nix} | 0 .../{obs/default.nix => multimedia/obs.nix} | 0 home/resources/icons/hibernate.png | Bin 4687 -> 0 bytes home/resources/icons/line-icons.nix | 16 - home/resources/icons/lock.png | Bin 2983 -> 0 bytes home/resources/icons/logout.png | Bin 3660 -> 0 bytes home/resources/icons/reboot.png | Bin 3957 -> 0 bytes home/resources/icons/shutdown.png | Bin 4124 -> 0 bytes home/resources/icons/suspend.png | Bin 4510 -> 0 bytes .../{themes => theme}/SerenityOS-GTK.nix | 0 .../{themes => theme}/SerenityOS.nix | 0 home/resources/{icons => theme}/avatar.jpg | Bin home/resources/{themes => theme}/default.nix | 0 .../{themes => theme}/serenityos-base.nix | 0 home/resources/{themes => theme}/template.nix | 0 .../resources/{themes => theme}/themepkgs.nix | 0 23 files changed, 14 insertions(+), 607 deletions(-) delete mode 100644 home/desktop/niri/niri.kdl rename home/desktop/{ => sway}/sway.nix (100%) rename home/desktop/{ => sway}/swayfx.nix (100%) rename home/programs/{music/production.nix => multimedia/music-production.nix} (100%) rename home/programs/{music/default.nix => multimedia/music.nix} (100%) rename home/programs/{obs/default.nix => multimedia/obs.nix} (100%) delete mode 100755 home/resources/icons/hibernate.png delete mode 100644 home/resources/icons/line-icons.nix delete mode 100755 home/resources/icons/lock.png delete mode 100755 home/resources/icons/logout.png delete mode 100755 home/resources/icons/reboot.png delete mode 100755 home/resources/icons/shutdown.png delete mode 100755 home/resources/icons/suspend.png rename home/resources/{themes => theme}/SerenityOS-GTK.nix (100%) rename home/resources/{themes => theme}/SerenityOS.nix (100%) rename home/resources/{icons => theme}/avatar.jpg (100%) rename home/resources/{themes => theme}/default.nix (100%) rename home/resources/{themes => theme}/serenityos-base.nix (100%) rename home/resources/{themes => theme}/template.nix (100%) rename home/resources/{themes => theme}/themepkgs.nix (100%) diff --git a/flake.nix b/flake.nix index 5bac0f1..aad886b 100755 --- a/flake.nix +++ b/flake.nix @@ -77,10 +77,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - noctalia = { # cool desktop shell - https://docs.noctalia.dev/getting-started/nixos/ - url = "github:noctalia-dev/noctalia-shell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + noctalia = + { # cool desktop shell - https://docs.noctalia.dev/getting-started/nixos/ + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; ## Nice-to-haves for gaming - https://github.com/fufexan/nix-gaming nix-gaming = { url = "github:fufexan/nix-gaming"; }; @@ -104,6 +105,8 @@ # - REPLACE nix-colors = { url = "github:misterio77/nix-colors"; }; + stylix = { url = "github:danth/stylix"; }; + ## Boot animation #mac-style-plymouth = { # example setup I stole the code shamelessly from #url = "github:SergioRibera/s4rchiso-plymouth-theme"; @@ -120,7 +123,8 @@ }; - outputs = { self, nixpkgs, sops-nix, home-manager, musnix, niri, noctalia, ... } + outputs = + { self, nixpkgs, sops-nix, home-manager, musnix, niri, noctalia, ... } @inputs: let @@ -160,6 +164,7 @@ sops-nix.nixosModules.sops musnix.nixosModules.musnix home-manager.nixosModules.home-manager + #inputs.stylix.nixosModules.stylix { home-manager = { useGlobalPkgs = true; diff --git a/home/default.nix b/home/default.nix index 567b289..99e2b09 100755 --- a/home/default.nix +++ b/home/default.nix @@ -50,7 +50,7 @@ in { ## home directories. Additional modules ## can be declared alongside `u-username/default.nix` ## and then imported in this section. - #./home.nix + #./theme ./desktop ./programs ./scripts diff --git a/home/desktop/default.nix b/home/desktop/default.nix index ae6b30f..32ee661 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -18,7 +18,9 @@ in { ./hyprlock.nix # screen locker ./dunst.nix # notifier ./wofi.nix # launcher - ./niri # desktop shell + ./niri # WM + #./sway # WM + ./noctalia.nix # Desktop shell ]; diff --git a/home/desktop/niri/niri.kdl b/home/desktop/niri/niri.kdl deleted file mode 100644 index 7da9a6a..0000000 --- a/home/desktop/niri/niri.kdl +++ /dev/null @@ -1,584 +0,0 @@ -// 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%" -} - - - -output "DP-4" { - mode "3440x1440@74.924" - scale 1.0 - position x=1920 y=0 - variable-refresh-rate on-demand=true - focus-at-startup - hot-corners { - top-left - } - layout { - } -} - -output "HDMI-A-2" { - mode "1920x1080@60" - scale 1.0 - position x=0 y=360 - hot-corners { - top-left - } -} - -// 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 8 - - // 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 - width 2 - active-color "#7fc8ff" - inactive-color "#505050" - active-gradient from="#00cdff" to="#80c8ff" angle=45 - inactive-gradient from="#705050" to="#808080" angle=45 relative-to="workspace-view" - // 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. - // 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". - } - - border { - off - } - - // 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 2 - right 2 - top 2 - bottom 4 - } -} - -prefer-no-csd - -// 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" -spawn-at-startup "kitty" "btop" -spawn-sh-at-startup "swaybg -m fill -i ~/Pictures/SerenityOS Branding/SerenityOS Wallpapers/duskGradient.png" - -// 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 { - 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 1.25 -} - -// 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 {} -} - -window-rule { - geometry-corner-radius 16 - clip-to-geometry true - opacity 0.95 - draw-border-with-background false -} - -// 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 { - // 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+Return hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } - Mod+Tab hotkey-overlay-title="Run an Application: wofi" { spawn "wofi"; } - Mod+Escape hotkey-overlay-title="Lock the Screen: hyprlock" { spawn "hyprlock"; } - - // 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+Shift+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/home/desktop/sway.nix b/home/desktop/sway/sway.nix similarity index 100% rename from home/desktop/sway.nix rename to home/desktop/sway/sway.nix diff --git a/home/desktop/swayfx.nix b/home/desktop/sway/swayfx.nix similarity index 100% rename from home/desktop/swayfx.nix rename to home/desktop/sway/swayfx.nix diff --git a/home/programs/music/production.nix b/home/programs/multimedia/music-production.nix similarity index 100% rename from home/programs/music/production.nix rename to home/programs/multimedia/music-production.nix diff --git a/home/programs/music/default.nix b/home/programs/multimedia/music.nix similarity index 100% rename from home/programs/music/default.nix rename to home/programs/multimedia/music.nix diff --git a/home/programs/obs/default.nix b/home/programs/multimedia/obs.nix similarity index 100% rename from home/programs/obs/default.nix rename to home/programs/multimedia/obs.nix diff --git a/home/resources/icons/hibernate.png b/home/resources/icons/hibernate.png deleted file mode 100755 index bf2b0010414af5077f0a63d61a9b04c839038e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4687 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 diff --git a/home/resources/icons/line-icons.nix b/home/resources/icons/line-icons.nix deleted file mode 100644 index e32190e..0000000 --- a/home/resources/icons/line-icons.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs }: - -pkgs.stdenv.mkDerivation { - name = "line-icons"; - - src = pkgs.fetchurl { - url = ""; - hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - }; - - dontUnpack = true; - installPhase = '' - mkdir -p $out - ${pkgs.unzip}/bin/unzip $src -d $out/ - ''; -} diff --git a/home/resources/icons/lock.png b/home/resources/icons/lock.png deleted file mode 100755 index da59b10e1133cad9b2ff39bfb0e5148fd9d552a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2983 zcmdT`X;c*16@FDz(?ugtEe#UZ>W&ITM*%@W1d68FMnF^;mvLd5umubtD2NUe%_=b1 z4$2~i=}}@55fF_6L8VzWj5;WS8?u@p(+G_*0kMU74aURC;UpRVr(UF{6U$q7rPgJ@ubIR6|Htdm!xY_f~_n!87|e0@xEYf`CYO8I49bpGq!EX7UQzh)wba+ zR%N|;^%mlL+wyCDV)QIm3e^@1%*@Wxyol7WPR}Z_$l=E;FilcA#pzV zt}jVm_xTEYyZ&X2Gt}Gc!6P}qsE#ThuyVV|1d@nuOBQH2Fy=^*tGF^8)I(0QU zTb6!q1SznW_T_PlFRgeJ#(KO`p6J$lLUk%KdDNz|ddktqgkE|;rykMNOulCrR9PJ# z7ZMXWQ}Tz22^EIV{{A$Nz&!X~RD~Pe1<=FojZ0k;bZSu^J7VA~e5l+JzFBcRB$=_E z-mc6cH63+p`?9rFu~2r_Q{e0u|Kw%&yA>aLoDhG?PF{sA1t`KCD}O~#8L6q#m1m;hmBA2*$( zGmV81zTl?gByPgb1fqFR&Q1L%`>(K(3AMZdMx$2uAn5$as6gZ7dBkA;oqLCLolC}t z3F+nHXGN9ljTXqM>8Oy%^6e{d$>bN>mlH3T+});_(MI9DJ zf3#y?x7-olrEi=pTyy?;eKjFOn~iE;>`3X7*yy!7rKNwxys4^9j$Ye0x;?M!m#i^R z^=G*(TAS}h*L3JQ$~dyvH9d%MYlCGAmRa|!V(YH*1K}uEjOW@cr@CFA=2YdD2Wpd# ztfMq7kb#QFt=TsFyo*7DTmNZVjfiVoyHjQ$JG^IlnO?-ASf@?=Oi11w2)Q13eN&q~ z6`^VyR|ullMX0nqss4vI9iSqu6@Z5HqcK@v|JUvm?cf3$O8dGS4a4tqqfA3mnr-?| zSs)^Hqal3+GvM8|GpKaQ2rxXB5RqErw(IB1DL_zBA=x(4LD~0Qy{5B91|}6t9%ic% z03*8Z2)#+V_?7KVw~Q;v0PQ=s6GUf>nFV}B(m?)Pqrj!Tz+Go_B-*Gp*NX-uT@%g- zS4EoLR7v`+ya(;x@Hh}tCW?~>XmDv@(WH^@(w-6Wx6$tCFKchih1fF)3asxGNqOvWEd&GqwNU{1X!~&c{|4xtJNQ=pO4q3lmIbNj|G7=zoBEtS z1Q!YbLyIB;QL_Xf)YGB*Rfxvl1C|L*xG{VuL8`?s=td@)x*6d(0&WgVB1h!0c;rm_ z08_e%eeGqjnh98wCeM%LC4$?!4gI~80u)+`njCjcfU1T|4hP*f3(fE1ni2B zv7bK64-e*lGTo1xeF4926xedkNt*=AsjVb1@Aw9;nc5O_f<7@k<_BB}diOw_A^e7l z^}oBkH-Lo&{C#+Ai<0jgjI*P8xU_BDUULi}9vVaTdn4d@%kbDskVS$Ot(6;RbpsDS zQR+S&m+4b%Ea2qi0WArRUgRs%F<%TRbVzJM%|zg~Vg0uVhYx}m_3lGB&LBAZz0c|` zpXKr1KqX(2tMq(O!s_KHeSfy5gh27Vu^^40CeNstrGmyKMidt#ZoB|lT>3=|)0aT7 gO~92+jjWntK4Oj7R%IN&0sr8Dr>l>kf*&CI5yMTGd;kCd diff --git a/home/resources/icons/logout.png b/home/resources/icons/logout.png deleted file mode 100755 index 8a259220a62ee279915cb2fbf8a76a4a31487b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3660 zcmd5;dvJ_d7C-mvN4~uD7x8Ekx&eQtva~CX{ z0}#A*&DJq-=k$S9GbUA)e4f?S5IAJ=fX1Sr`;!k(T<5iK%KTfE4{n6czmdPcT_gR?yAjQnsj}bazg4 z)#T59`!qeeyZl<#k}H?440+gZ;O3py#@-QU?yX-rr7_L4dHS%VFkwLF*x${(b3Wkw z&4SX(m3y@pUz`}XI$`wO8?ue6lSk8C)gvCA5Qb*W9TGMnuwS>d@x{LiyIj!I-epPL zt!0if&S)W6QPuFivAr}RheYt0unPZ~vBHNuX2 zwq1V`t_*0{k=<=1<1Ag9+n9aeDcLnjux#s7a3Z8-f!E&$+cILz+vU!bwcigbDRV|7 zsQ7-%yH=1+oz`9toKsSk{^`856nEjF=4Od3VQKyPxTI~kF7jC)#v1U8zm}*|Cj5A& z#!XAZC9I`?Br>=l9gQB#;>SmOJo4=7t?9J8;n*YqpSXC#*vaX4p53indS_gh=-+I= z?>0^AG3T){sZYbJ=?k6jg(;kihAsKdPPu=$liDfMm$iK{?U5%4Lu$F}jEzlqOK#A6{FOz4xZsbw&<# z)WSiv3U;n&==w+dqZbOkgdj6oq&!lQw{GGjYT{Q=pBxz-CjKyd>HYbXkFdZgcV4Y zU;;%M5=(>XoC00)bUdIa&8s@s6J2@R1)HR}v7x_Ulav!%)0XRWevB%j-ki0wS(^+# zfyXSuD3#J5s?CC=cGH=cQetc(=bq<{1!YE2gzIWxL^s4XaOG~>s4Na5mg!f!ejm$% zYPeeKy4qjLE0kPs)1xja9=yGIAMs{spDBafEsy0Ub8S0KrdB8wyhQIXi_s$fFL07&aAH&X1C8u{#yw!IS4`!QWRf$ zwztEj!`i_j^vm$qOIciTf=$xE1Aw0z;CB6U(lNPQ)-gkPUnCXXlL_@fT_^^1P!hu% zfF`P!<^Tmaf`FfxNf1qfPSOM9fFDnz2H{xE7Q~%6p?Kz;lf9vp5(V&GEJBT;Za`@>rVr|q)Q6ZOy`KcK;29xE8 zw6C64A(O^2K;{3yP0fg891+QK+BFzN4G<)106$R!&x#uKQc=TySf@%||w0>J~s7Vg6(&qSmRkwfjsPb8&g}IQkJ(Ubgt#;U$dFGOq-|aO%YS zJ9>h}HME0Ih+pjssozfv0l;2`9XWW`PHAF#DWZ3R6G=d0cJ z^wEXWBc{COp1wY_DjKYzz+q#Y0hTBxFnV^)m|CnpfvYIeou3QWS`abX5^%ldh4M%N~hjJFS=YLqNn$1!C~n@;(YfuxHEl|2b)f%$$WDGmc79Zx{!7}7SD;Gb++Kyjk!@%^$pmnQ@tUlXB{?C z!RVaEAuXQL4>y zEJr_8q%ncjrg0Dn?0SBvoTyoTBCGw-F(1JtP}f(!N5O)$^WdKBJu6F3Tdf>#5+Cdv z90NNrE=&03EwwN$Gf_r`!1VN$i=RxK^B~~csSI|a)Bq3^DG+#|+>9s?H-*k7;j|Cgq%yet z`X4#32Vr-}@bfOmWtH*=gCX(GOzSgz#AkqXutiQ=UEzMvQ%M}QAi$QFub_zDv=zCSTcJ#slV-Q0ZFEjI+~AIOD1K2T2`Q!8KHd!~30LJR|_xzY#hqWSFY zd##GcAw>EfHP7?~djOOXb{uc<<xv8|x%`A7uvICu%9ae=)SATBQfI+y@_ldJYl7t2Ivao{5h-?AO2KS7Zro XozeZ!hS_t6Q=0hb1jErtW9B~r%&1|! diff --git a/home/resources/icons/reboot.png b/home/resources/icons/reboot.png deleted file mode 100755 index e5fd221a9c500a324ecffd921e18309db45eade2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3957 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 u{}KBqx@M&pESmdT1x5DuWAXfbub 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 rO~qnnl5T``QYZliqa><(dQaOWm#UD+aTtF9