diff --git a/flake.nix b/flake.nix index 136f452..932e213 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-colors.url = "github:misterio77/nix-colors"; stylix = { url = "github:nix-community/stylix"; @@ -29,8 +28,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - - blog-generator.url = "github:adrlau/blog-generator"; + blog-generator.url = "github:adrlau/blog-generator"; }; outputs = @@ -65,28 +63,26 @@ home-manager.users.gunalx = import ./home/gunalx.nix; home-manager.backupFileExtension = "bac"; home-manager.extraSpecialArgs = { inherit nix-colors inputs; }; - home-manager.sharedModules = [ + home-manager.sharedModules = [ inputs.sops-nix.homeManagerModules.sops inputs.stylix.homeModules.stylix ]; } - + ./modules/unstable.nix - + sops-nix.nixosModules.sops lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.dell-xps-13-9370 - #temporarily for testing run my blog on my laptop blog-generator.nixosModules.default ]; }; - # aragon nixosConfigurations.aragon = nixpkgs.lib.nixosSystem { inherit system; @@ -101,13 +97,13 @@ home-manager.users.gunalx = import ./home/gunalx.nix; home-manager.backupFileExtension = "bac"; home-manager.extraSpecialArgs = { inherit nix-colors inputs; }; - home-manager.sharedModules = [ + home-manager.sharedModules = [ inputs.sops-nix.homeManagerModules.sops inputs.stylix.homeModules.stylix ]; } - - ./modules/unstable.nix + + ./modules/unstable.nix sops-nix.nixosModules.sops @@ -116,16 +112,13 @@ ]; }; - - - # galadriel nixosConfigurations.galadriel = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs system; }; modules = [ - ./modules/unstable.nix - + ./modules/unstable.nix + ./hosts/galadriel/configuration.nix sops-nix.nixosModules.sops @@ -135,7 +128,5 @@ ]; }; - - }; } diff --git a/home/bash.nix b/home/bash.nix index a7ff3a9..284cabe 100644 --- a/home/bash.nix +++ b/home/bash.nix @@ -59,18 +59,18 @@ YELLOW='\[\e[33m\]' MAGENTA='\[\e[35m\]' RED='\[\e[31m\]' - + if [[ -n "$SSH_CONNECTION" ]]; then REMOTE_LABEL="\[''${YELLOW}\] (ssh)\[''${RESET}\]" else REMOTE_LABEL="" fi - + # Git branch function parse_git_branch() { git branch --show-current 2>/dev/null | awk '{print " (" $1 ")"}' } - + # Set prompt if [[ $EUID -eq 0 ]]; then PS1="''${BOLD}''${RED}\u''${RESET}:''${BOLD}''${RED}\h''${REMOTE_LABEL}''${RESET}:''${BOLD}''${GREEN}\w''${MAGENTA}\$(parse_git_branch) ''${BLUE}\A''${RESET}\$ " diff --git a/home/colors.nix b/home/colors.nix index b512e64..eb16c77 100644 --- a/home/colors.nix +++ b/home/colors.nix @@ -7,9 +7,8 @@ }: { - imports = [ - nix-colors.homeManagerModules.default - ./stylix.nix + imports = [ + nix-colors.homeManagerModules.default ]; colorScheme = { diff --git a/home/fcitx5.nix b/home/fcitx5.nix index d792b13..21fca09 100644 --- a/home/fcitx5.nix +++ b/home/fcitx5.nix @@ -10,7 +10,6 @@ fcitx5-mozc fcitx5-gtk qt6Packages.fcitx5-configtool - fcitx5-material-color # Add the theme package ]; settings = { @@ -18,16 +17,6 @@ globalOptions.Hotkey = { TriggerKey = "Control+space"; }; - - # Addon settings for the theme - addons.classicui = { - globalSection = { - Theme = "Material-Color-Dark"; - DarkTheme = "Material-Color-Dark"; - UseDarkTheme = true; - }; - }; - inputMethod = { "Groups/0" = { Name = "Default"; diff --git a/home/gunalx.nix b/home/gunalx.nix index adc00d1..e2f39e1 100644 --- a/home/gunalx.nix +++ b/home/gunalx.nix @@ -12,8 +12,11 @@ ./bash.nix ./xdg.nix - #graphical + # theming ./colors.nix + ./stylix.nix + + #graphical ./fuzzel.nix ./swaylock.nix ./gtklock.nix diff --git a/home/kdeconnect.nix b/home/kdeconnect.nix index a59aa77..4608d0a 100644 --- a/home/kdeconnect.nix +++ b/home/kdeconnect.nix @@ -13,6 +13,6 @@ enable = true; #package = pkgs.kdePackages.kdeconnect-kde; package = pkgs.gnomeExtensions.gsconnect; - indicator = true; + indicator = true; }; } diff --git a/home/neovim.nix b/home/neovim.nix index 41f7ccf..b1bc96e 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - - programs.neovim = { enable = true; viAlias = true; @@ -10,7 +8,7 @@ defaultEditor = true; withPython3 = true; withNodeJs = true; - + extraConfig = '' set backspace=indent,eol,start syntax on @@ -28,16 +26,15 @@ set clipboard=unnamed,unnamedplus set mouse=a - + ''; - + extraLuaConfig = '' vim.wo.number = true -- vim.wo.relativenumber = true vim.api.nvim_set_option("clipboard", "unnamedplus") ''; - extraPackages = [ pkgs.fzf ]; # For fzf-vim functionality plugins = with pkgs.vimPlugins; [ @@ -51,7 +48,6 @@ aider-nvim ]; - # CoC configuration (replacing coc-rust-analyzer plugin) coc.enable = true; coc.settings = { diff --git a/home/niri.nix b/home/niri.nix index b39cb60..861f55e 100644 --- a/home/niri.nix +++ b/home/niri.nix @@ -9,647 +9,647 @@ let palette = config.colorScheme.palette; niriConfig = '' - // KDL‐format niri config + // KDL‐format niri config - input { - //keyboard { xkb { layout "us,no,mozc"; options "grp:ctrl_space_toggle"; }; } - keyboard { xkb { layout "us,no";}; } - touchpad { - tap - natural-scroll - accel-speed 0.1 - accel-profile "flat" - } - warp-mouse-to-focus - focus-follows-mouse max-scroll-amount="0%" - } + input { + //keyboard { xkb { layout "us,no,mozc"; options "grp:ctrl_space_toggle"; }; } + keyboard { xkb { layout "us,no";}; } + touchpad { + tap + natural-scroll + accel-speed 0.1 + accel-profile "flat" + } + warp-mouse-to-focus + focus-follows-mouse max-scroll-amount="0%" + } - output "AU Optronics 0x212B Unknown" { - mode "3840x2160@60.002" - //focus-at-startup - scale 2 - transform "normal" - position x=1920 y=2160 - } - output "ASUSTek COMPUTER INC ASUS MB16AH L9LMTF068515" { - mode "1920x1080@60.000" - scale 1 - transform "normal" - position x=1920 y=1080 - } - output "Hewlett Packard HP ZR24w CNT01710L4" { - mode "1920x1200@60.000" - scale 1 - transform "normal" - position x=960 y=960 - } - output "Hewlett Packard HP ZR24w CNT0181039" { - mode "1920x1200@60.000" - scale 1 - transform "normal" - position x=2880 y=960 - } + output "AU Optronics 0x212B Unknown" { + mode "3840x2160@60.002" + //focus-at-startup + scale 2 + transform "normal" + position x=1920 y=2160 + } + output "ASUSTek COMPUTER INC ASUS MB16AH L9LMTF068515" { + mode "1920x1080@60.000" + scale 1 + transform "normal" + position x=1920 y=1080 + } + output "Hewlett Packard HP ZR24w CNT01710L4" { + mode "1920x1200@60.000" + scale 1 + transform "normal" + position x=960 y=960 + } + output "Hewlett Packard HP ZR24w CNT0181039" { + mode "1920x1200@60.000" + scale 1 + transform "normal" + position x=2880 y=960 + } + + //pvv demiurgen + output "Ancor Communications Inc MG248 G7LMQS010063" { + mode "1920x1080@60.000" + scale 1 + position x=1050 y=1080 + } + output "ASUSTek COMPUTER INC MG248 K2LMQS048969" { + mode "1920x1080@60.000" + scale 1 + position x=2970 y=1080 + } + + + + //desktop outputs. + output "Dell Inc. DELL U2410 F525M06G123L" { + mode "2560x1440@144.000" + scale 1 + transform "90" + position x=0 y=0 + } + output "Samsung Electric Company LC27G5xT H4LR800468" { + mode "1920x1200@59.950" + variable-refresh-rate on-demand=true + //focus-at-startup + scale 1 + transform "normal" + position x=1200 y=240 + } + + //switch events for open closing lid. + switch-events { + lid-close { spawn "gtklock"; } + //lid-open { spawn "notify-send" "The laptop lid is open!"; } + tablet-mode-on { spawn "bash" "-c" "wvkbd-mobintl"; } + tablet-mode-off { spawn "bash" "-c" "pkill wvkbd-mobintl"; } + } + + + // Settings that influence how windows are positioned and sized. + // Find more information on the wiki: + // https://github.com/YaLTeR/niri/wiki/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 "on-overflow" + + // 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 but that is annoying. + proportion 0.3333333 + proportion 0.5 + proportion 0.6666667 + + // 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 { + proportion 1.0 + proportion 0.5 + + } + + // You can change the default width of the new windows. + default-column-width { proportion 1.0; } + // 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 - //pvv demiurgen - output "Ancor Communications Inc MG248 G7LMQS010063" { - mode "1920x1080@60.000" - scale 1 - position x=1050 y=1080 - } - output "ASUSTek COMPUTER INC MG248 K2LMQS048969" { - mode "1920x1080@60.000" - scale 1 - position x=2970 y=1080 - } + // How many logical pixels the ring extends out from the windows. + width 2 + // 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 "${palette.base0D}" - //desktop outputs. - output "Dell Inc. DELL U2410 F525M06G123L" { - mode "2560x1440@144.000" - scale 1 - transform "90" - position x=0 y=0 - } - output "Samsung Electric Company LC27G5xT H4LR800468" { - mode "1920x1200@59.950" - variable-refresh-rate on-demand=true - //focus-at-startup - scale 1 - transform "normal" - position x=1200 y=240 - } + // Color of the ring on inactive monitors. + inactive-color "${palette.base03}" - //switch events for open closing lid. - switch-events { - lid-close { spawn "gtklock"; } - //lid-open { spawn "notify-send" "The laptop lid is open!"; } - tablet-mode-on { spawn "bash" "-c" "wvkbd-mobintl"; } - tablet-mode-off { spawn "bash" "-c" "pkill wvkbd-mobintl"; } + // 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="#bbddff" 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" } - - // Settings that influence how windows are positioned and sized. - // Find more information on the wiki: - // https://github.com/YaLTeR/niri/wiki/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 "on-overflow" - - // 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 but that is annoying. - proportion 0.3333333 - proportion 0.5 - proportion 0.6666667 - - // 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 { - proportion 1.0 - proportion 0.5 - - } - - // You can change the default width of the new windows. - default-column-width { proportion 1.0; } - // 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 2 - - // 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 "${palette.base0D}" - - // Color of the ring on inactive monitors. - inactive-color "${palette.base03}" - - // 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="#bbddff" 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 2 - active-color "${palette.base0A}" - inactive-color "${palette.base03}" - // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" - // 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 false - - // 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 24 - right 24 - // top 64 - // bottom 64 - } - } - - overview { - zoom 0.5 - backdrop-color "#${palette.base00}" - } - - // 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. - // spawn-at-startup "alacritty" "-e" "fish" - spawn-at-startup "foot" "--server" - spawn-at-startup "mako" - spawn-at-startup "swww-daemon" - spawn-at-startup "sh" "-c" "while true; do waybar; done" //disabled to a systemd service. in a while because it sometimes crashes. - spawn-at-startup "sh" "-c" "while true; do swww img -f Nearest --transition-step 2 \"$(find ~/Pictures/wallpapers/ -type l,f | shuf -n 1)\"; sleep 270; done" - - - // 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-%Y-%m-%d %H-%M-%S.png" - - // Animation settings. - // The wiki explains how to configure individual animations: - // https://github.com/YaLTeR/niri/wiki/Configuration:-Animations - animations { - // Uncomment to turn off all animations. + // 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 - - // Slow down all animations by this factor. Values below 1 speed them up instead. - // slowdown 0.3 - + width 2 + active-color "${palette.base0A}" + inactive-color "${palette.base03}" + // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" + // 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 - layer-rule { - match namespace="^notifications$" - block-out-from "screencast" + // 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 false + + // 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" } - // Window rules let you adjust behavior for individual windows. - // Find more information on the wiki: - // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules - - - - // Floating Bitwarden extension popup windows only - window-rule { - //match title=r#"^Extension: \(Bitwarden Password Manager\) - Bitwarden — Mozilla Firefox$"# - match title="^Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox$" - //match app-id=r#"(?i)^bitwarden$"# - open-floating true - default-column-width { proportion 0.3;} - default-floating-position x=0 y=0 relative-to="top-left" - opacity 0.9 - block-out-from "screen-capture" + // 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 24 + right 24 + // top 64 + // bottom 64 } + } - // kde connect - window-rule { - match app-id=r"org.kde.kdeconnect.daemon" // ID of presentation pointer overlay - open-floating true - open-fullscreen false - default-floating-position x=0 y=0 relative-to="top-left" + overview { + zoom 0.5 + backdrop-color "#${palette.base00}" + } + + // 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. + // spawn-at-startup "alacritty" "-e" "fish" + spawn-at-startup "foot" "--server" + spawn-at-startup "mako" + spawn-at-startup "swww-daemon" + spawn-at-startup "sh" "-c" "while true; do waybar; done" //disabled to a systemd service. in a while because it sometimes crashes. + spawn-at-startup "sh" "-c" "while true; do swww img -f Nearest --transition-step 2 \"$(find ~/Pictures/wallpapers/ -type l,f | shuf -n 1)\"; sleep 270; done" + + + // 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-%Y-%m-%d %H-%M-%S.png" + + // Animation settings. + // The wiki explains how to configure individual animations: + // https://github.com/YaLTeR/niri/wiki/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 0.3 + + } + + + layer-rule { + match namespace="^notifications$" + block-out-from "screencast" + } + + // Window rules let you adjust behavior for individual windows. + // Find more information on the wiki: + // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules + + + + // Floating Bitwarden extension popup windows only + window-rule { + //match title=r#"^Extension: \(Bitwarden Password Manager\) - Bitwarden — Mozilla Firefox$"# + match title="^Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox$" + //match app-id=r#"(?i)^bitwarden$"# + open-floating true + default-column-width { proportion 0.3;} + default-floating-position x=0 y=0 relative-to="top-left" + opacity 0.9 + block-out-from "screen-capture" + } + + // kde connect + window-rule { + match app-id=r"org.kde.kdeconnect.daemon" // ID of presentation pointer overlay + open-floating true + open-fullscreen false + default-floating-position x=0 y=0 relative-to="top-left" + + // Adjust these to your monitor's resolution + min-width 1920 + min-height 1080 + + // Optionally customize opacity of pointer + // opacity 1.0 + + tiled-state true + + focus-ring { + off + } + border { + off + } + shadow { + off + } + draw-border-with-background false + } + + + + // More aggressive matching for Firefox extension windows + window-rule { + // Match any Firefox window that might be an extension popup + match app-id="firefox$" + exclude title=".*Mozilla Firefox.*" - // Adjust these to your monitor's resolution - min-width 1920 - min-height 1080 - - // Optionally customize opacity of pointer - // opacity 1.0 - - tiled-state true - - focus-ring { - off - } - border { - off - } - shadow { - off - } - draw-border-with-background false - } - - - - // More aggressive matching for Firefox extension windows - window-rule { - // Match any Firefox window that might be an extension popup - match app-id="firefox$" - exclude title=".*Mozilla Firefox.*" - - open-floating true - default-column-width { proportion 0.5; } - max-width 720 - } + open-floating true + default-column-width { proportion 0.5; } + max-width 720 + } - // dropdown terminal - window-rule { - match title="^dropdown$" - open-focused true - open-floating true - default-floating-position x=0 y=0 relative-to="top" - default-window-height { proportion 0.5; } - // 80% of the screen wide. - default-column-width { proportion 0.8; } - // block-out-from "screencast" - block-out-from "screen-capture" - } + // dropdown terminal + window-rule { + match title="^dropdown$" + open-focused true + open-floating true + default-floating-position x=0 y=0 relative-to="top" + default-window-height { proportion 0.5; } + // 80% of the screen wide. + default-column-width { proportion 0.8; } + // block-out-from "screencast" + block-out-from "screen-capture" + } - // foot smaller by default - window-rule { - match title="^foot$" - open-focused true - default-column-width { proportion 0.5; } - } + // foot smaller by default + window-rule { + match title="^foot$" + open-focused true + default-column-width { proportion 0.5; } + } - //fix steam notifications to bottom rigth - window-rule { - match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"# - default-floating-position x=10 y=10 relative-to="bottom-right" - //block-out-from "screencast" - block-out-from "screen-capture" - } + //fix steam notifications to bottom rigth + window-rule { + match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"# + default-floating-position x=10 y=10 relative-to="bottom-right" + //block-out-from "screencast" + block-out-from "screen-capture" + } - window-rule { - geometry-corner-radius 12 - clip-to-geometry true - } + window-rule { + geometry-corner-radius 12 + clip-to-geometry true + } - window-rule { - match app-id="onboard" - match app-id="Onboard" - open-floating true - default-window-height { proportion 0.2; } - default-column-width { proportion 0.8; } - block-out-from "screen-capture" - } + window-rule { + match app-id="onboard" + match app-id="Onboard" + open-floating true + default-window-height { proportion 0.2; } + default-column-width { proportion 0.8; } + block-out-from "screen-capture" + } - 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`. + 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; } - Mod+Slash { toggle-overview; } + // Mod-Shift-/, which is usually the same as Mod-?, + // shows a list of important hotkeys. + Mod+Shift+Slash { show-hotkey-overlay; } + Mod+Slash { toggle-overview; } - // Suggested binds for running programs: terminal, app launcher, screen locker. - Mod+Return { spawn "footclient"; } - Mod+T { spawn "sh" "-c" "if pgrep -f '^foot -T dropdown$' >/dev/null; then pkill -f '^foot -T dropdown$'; else exec foot -T dropdown; fi"; } - Mod+D { spawn "fuzzel"; } - Mod+O { toggle-window-rule-opacity; } - Mod+G { spawn "gtklock"; } + // Suggested binds for running programs: terminal, app launcher, screen locker. + Mod+Return { spawn "footclient"; } + Mod+T { spawn "sh" "-c" "if pgrep -f '^foot -T dropdown$' >/dev/null; then pkill -f '^foot -T dropdown$'; else exec foot -T dropdown; fi"; } + Mod+D { spawn "fuzzel"; } + Mod+O { toggle-window-rule-opacity; } + Mod+G { spawn "gtklock"; } - // You can also use a shell. Do this if you need pipes, multiple commands, etc. - // Note: the entire command goes as a single argument in the end. - // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty";} + // You can also use a shell. Do this if you need pipes, multiple commands, etc. + // Note: the entire command goes as a single argument in the end. + // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty";} - // Example volume keys mappings for PipeWire & WirePlumber. - // The allow-when-locked=true property makes them work even when the session is locked. - XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } - XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } + XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - Mod+Shift+Q { close-window; } + Mod+Shift+Q { close-window; } - Mod+Left { focus-column-or-monitor-left; } - Mod+Down { focus-window-or-monitor-down; } - Mod+Up { focus-window-or-monitor-up; } - Mod+Right { focus-column-or-monitor-right; } - Mod+H { focus-column-or-monitor-left; } - Mod+J { focus-window-or-monitor-down; } - Mod+K { focus-window-or-monitor-up; } - Mod+L { focus-column-or-monitor-right; } + Mod+Left { focus-column-or-monitor-left; } + Mod+Down { focus-window-or-monitor-down; } + Mod+Up { focus-window-or-monitor-up; } + Mod+Right { focus-column-or-monitor-right; } + Mod+H { focus-column-or-monitor-left; } + Mod+J { focus-window-or-monitor-down; } + Mod+K { focus-window-or-monitor-up; } + Mod+L { focus-column-or-monitor-right; } - Alt+Tab { focus-window-previous; } + Alt+Tab { focus-window-previous; } - 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; } + 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; } + // 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+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+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; } + 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; } - // ... + // 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; } - // ... + // 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; } + 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; } - 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; } + 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+Shift+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+Shift+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Shift+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+Shift+WheelScrollUp cooldown-ms=150 { move-column-to-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+Shift+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+Shift+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Shift+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+Shift+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - Mod+WheelScrollRight cooldown-ms=150 { focus-column-right; } - Mod+WheelScrollLeft cooldown-ms=150 { focus-column-left; } - Mod+Ctrl+WheelScrollRight cooldown-ms=150 { move-column-right; } - Mod+Ctrl+WheelScrollLeft cooldown-ms=150 { move-column-left; } + Mod+WheelScrollRight cooldown-ms=150 { focus-column-right; } + Mod+WheelScrollLeft cooldown-ms=150 { focus-column-left; } + Mod+Ctrl+WheelScrollRight cooldown-ms=150 { move-column-right; } + Mod+Ctrl+WheelScrollLeft cooldown-ms=150 { move-column-left; } - // Usually scrolling up and down with Shift in applications results in - // horizontal scrolling; these binds replicate that. - // But i found it impractical. workspaces i can graphically cahnge. and probably more rarly, so i swapped it - Mod+WheelScrollDown cooldown-ms=150 { focus-column-right; } - Mod+WheelScrollUp cooldown-ms=150 { focus-column-left; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-right; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-left; } + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + // But i found it impractical. workspaces i can graphically cahnge. and probably more rarly, so i swapped it + Mod+WheelScrollDown cooldown-ms=150 { focus-column-right; } + Mod+WheelScrollUp cooldown-ms=150 { focus-column-left; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-right; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { 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 "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } - // Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + // 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 "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } + // Mod+TouchpadScrollUp { spawn "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; } + // 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; } + // 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; } + // 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; } + // 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; } + // 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; } - Mod+Shift+R { switch-preset-window-height; } - Mod+Ctrl+R { reset-window-height; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - Mod+Ctrl+Shift+F { toggle-windowed-fullscreen; } - - // 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+R { switch-preset-column-width; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+Ctrl+Shift+F { toggle-windowed-fullscreen; } + + // 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; } + Mod+C { center-column; } - // 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%"; } - Mod+0 { set-column-width "+10%"; } + // 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%"; } + Mod+0 { 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%"; } - Mod+Shift+0 { set-window-height "+10%"; } + // Finer height adjustments when in column with other windows. + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + Mod+Shift+0 { 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; } + // 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; } + // 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"; } + // 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; } + 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; } + // 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; } + // 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; } - } + // 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; } + } - xwayland-satellite { - path "${lib.getExe pkgs.xwayland-satellite}" - } - //Enviroment to be set. - environment { - ELECTRON_OZONE_PLATFORM_HINT "auto" - } + xwayland-satellite { + path "${lib.getExe pkgs.xwayland-satellite}" + } + //Enviroment to be set. + environment { + ELECTRON_OZONE_PLATFORM_HINT "auto" + } ''; @@ -702,10 +702,7 @@ in noto-fonts-color-emoji noto-fonts-monochrome-emoji - - - - # from archwiki recomended. + # from archwiki recomended. fuzzel mako waybar @@ -716,7 +713,6 @@ in xwayland-satellite udiskie - ]; # Drop the interpolated KDL into ~/.config/niri/config.kdl diff --git a/home/stylix.nix b/home/stylix.nix index d3f48ba..cb211f4 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -3,10 +3,17 @@ { stylix = { enable = true; - autoEnable = false; - targets.gtk.enable = true; - targets.qt.enable = true; + #autoEnable = false; + #targets.gtk.enable = true; + #targets.qt.enable = true; + + #manually disable stuff i have done manually + targets.mako.enable = false; + targets.foot.enable = false; + targets.swaylock.enable = false; + targets.fuzzel.enable = false; + targets.zed.enable = false; base16Scheme = { scheme = config.colorScheme.name; @@ -29,5 +36,23 @@ base0F = config.colorScheme.palette.base0F; }; + fonts = { + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + monospace = { + package = pkgs.notonoto; + name = "NOTONOTO"; + }; + emoji = { + package = pkgs.noto-fonts-monochrome-emoji; + name = "Noto Emoji"; + }; + }; }; } diff --git a/home/zed.nix b/home/zed.nix index 177beff..fa59c5a 100644 --- a/home/zed.nix +++ b/home/zed.nix @@ -17,16 +17,43 @@ programs.zed-editor = { enable = true; package = pkgs.unstable.zed-editor-fhs; - extraPackages = with pkgs; [ - #nodejs + nodejs copilot-language-server github-copilot-cli nixd - #nodejs-slim vscode-extensions.github.copilot ]; - extensions = [ "nix" "toml" "rust" "html" "yaml" "python" "make" "xml" "dockerfile" "vue" "latex" "csv" "rainbow csv" "snippets" "typst" "mermaid" "markdownlint" "markdown oxide" "java" "dart" "go" "c#" "json" "flask snippets" "python snippets" "flutter snippets" "tokyo night themes"]; + extensions = [ + "nix" + "toml" + "rust" + "html" + "yaml" + "python" + "make" + "xml" + "dockerfile" + "vue" + "latex" + "csv" + "rainbow csv" + "snippets" + "typst" + "mermaid" + "markdownlint" + "markdown oxide" + "java" + "dart" + "go" + "c#" + "json" + "flask snippets" + "python snippets" + "flutter snippets" + "tokyo night themes" + "opencode" + ]; userSettings = { theme = { mode = "system"; diff --git a/hosts/aragon/configuration.nix b/hosts/aragon/configuration.nix index 2a8259c..15006cb 100644 --- a/hosts/aragon/configuration.nix +++ b/hosts/aragon/configuration.nix @@ -2,70 +2,73 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - + # Core system modules ../../modules/boot.nix ../../modules/nix.nix ../../modules/pam.nix ../../modules/polkit.nix ../../modules/zram.nix - + # Networking and remote access ../../modules/openssh.nix ../../modules/tailscale.nix - + # User interface and desktop ../../modules/displaymanager.nix ../../modules/xdg.nix ../../modules/sound.nix ../../modules/bluetooth.nix ../../modules/desktopApplications.nix - + # Development tools and user configuration ../../modules/basePackages.nix ../../modules/develPackages.nix ../../modules/gunalx.nix - + # Containerization and cloud ../../modules/podman.nix - + # Scientific and data tools ../../modules/jupyterhub.nix - + # Software and gaming ../../modules/steam.nix - + # SDR (Software Defined Radio) ../../modules/rtlsdr.nix ../../modules/websdr.nix - + # Secrets management ../../secrets/sops.nix ../../secrets/sopsconf.nix - + ]; - - - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Setup keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; # Enable swap on luks - boot.initrd.luks.devices."luks-08650b6b-6143-4503-8bf5-a3d32ef62d73".device = "/dev/disk/by-uuid/08650b6b-6143-4503-8bf5-a3d32ef62d73"; - boot.initrd.luks.devices."luks-08650b6b-6143-4503-8bf5-a3d32ef62d73".keyFile = "/crypto_keyfile.bin"; + boot.initrd.luks.devices."luks-08650b6b-6143-4503-8bf5-a3d32ef62d73".device = + "/dev/disk/by-uuid/08650b6b-6143-4503-8bf5-a3d32ef62d73"; + boot.initrd.luks.devices."luks-08650b6b-6143-4503-8bf5-a3d32ef62d73".keyFile = + "/crypto_keyfile.bin"; networking.hostName = "aragon"; # Define your hostname. time.timeZone = "Europe/Amsterdam"; @@ -79,15 +82,14 @@ # sleep wakeup rules services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled" - ''; - + ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled" + ''; + #comment out to enable sleep. Uncommented over vacations # systemd.targets.sleep.enable = false; # systemd.targets.suspend.enable = false; # systemd.targets.hibernate.enable = false; # systemd.targets.hybrid-sleep.enable = false; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; diff --git a/hosts/aragon/hardware-configuration.nix b/hosts/aragon/hardware-configuration.nix index 0da13b5..90f66ae 100644 --- a/hosts/aragon/hardware-configuration.nix +++ b/hosts/aragon/hardware-configuration.nix @@ -1,15 +1,29 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = ["amdgpu" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + "sr_mod" + ]; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; @@ -17,7 +31,7 @@ hardware.amdgpu.opencl.enable = true; hardware.amdgpu.amdvlk.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - + hardware.graphics = { enable = true; }; @@ -28,53 +42,52 @@ ]; nixpkgs.config.rocmSupport = true; - + environment.variables = { - HSA_OVERRIDE_GFX_VERSION="10.3.0"; + HSA_OVERRIDE_GFX_VERSION = "10.3.0"; }; - #hardware.opengl.extraPackages32 = with pkgs; [ # driversi686Linux.amdvlk #]; -environment.systemPackages = with pkgs; [ - lact - rocmPackages.rocminfo - rocmPackages.rocm-smi - rocmPackages.rocm-runtime - rocmPackages.rocm-device-libs - rocmPackages.rocm-core - rocmPackages.rocm-cmake - rocmPackages.rocgdb - rocmPackages.rocblas - rocmPackages.rccl -]; -systemd.packages = with pkgs; [ lact ]; -systemd.services.lactd.wantedBy = ["multi-user.target"]; + environment.systemPackages = with pkgs; [ + lact + rocmPackages.rocminfo + rocmPackages.rocm-smi + rocmPackages.rocm-runtime + rocmPackages.rocm-device-libs + rocmPackages.rocm-core + rocmPackages.rocm-cmake + rocmPackages.rocgdb + rocmPackages.rocblas + rocmPackages.rccl + ]; + systemd.packages = with pkgs; [ lact ]; + systemd.services.lactd.wantedBy = [ "multi-user.target" ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/8ab16ad5-08d2-44f9-a9e4-2e6240bfd8f8"; + fsType = "ext4"; + }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/8ab16ad5-08d2-44f9-a9e4-2e6240bfd8f8"; - fsType = "ext4"; - }; + fileSystems."/mnt/steam" = { + device = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_with_Heatsink_2TB_S7HPNJ0X304250L-part1"; + fsType = "ext4"; + }; - fileSystems."/mnt/steam" = - { device = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_with_Heatsink_2TB_S7HPNJ0X304250L-part1"; - fsType = "ext4"; - }; + boot.initrd.luks.devices."luks-31bf11fb-518a-408a-af06-93af528a5985".device = + "/dev/disk/by-uuid/31bf11fb-518a-408a-af06-93af528a5985"; - boot.initrd.luks.devices."luks-31bf11fb-518a-408a-af06-93af528a5985".device = "/dev/disk/by-uuid/31bf11fb-518a-408a-af06-93af528a5985"; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/9A50-906F"; + fsType = "vfat"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/9A50-906F"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/c7cdfab4-2c92-42de-b951-ccc6fcd7b7d7"; } - ]; + swapDevices = [ + { device = "/dev/disk/by-uuid/c7cdfab4-2c92-42de-b951-ccc6fcd7b7d7"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/galadriel/configuration.nix b/hosts/galadriel/configuration.nix index c4223ea..26025f6 100644 --- a/hosts/galadriel/configuration.nix +++ b/hosts/galadriel/configuration.nix @@ -2,12 +2,17 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix ../../modules/boot.nix ../../modules/zram.nix ../../modules/zfs.nix @@ -23,19 +28,17 @@ ../../modules/basePackages.nix ../../modules/develPackages.nix - - ../../modules/vaultvarden.nix ../../modules/jellyfin.nix ../../modules/jupyterhub.nix - ../../modules/qbittorrent.nix # broken for now?: Yes, just need to add the zfs disc again, to enable the paths this depends on. Lets redo that maybe? + ../../modules/qbittorrent.nix # broken for now?: Yes, just need to add the zfs disc again, to enable the paths this depends on. Lets redo that maybe? ../../modules/mealie.nix ../../modules/miniflux.nix ../../modules/ollama.nix ../../modules/openwebui.nix ../../modules/immich.nix - ]; + ]; #Load zfs pool boot.zfs.extraPools = [ "Main" ]; @@ -44,8 +47,8 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "galadriel"; - networking.networkmanager.enable = true; + networking.hostName = "galadriel"; + networking.networkmanager.enable = true; time.timeZone = "Europe/Amsterdam"; @@ -69,4 +72,3 @@ system.stateVersion = "25.05"; # Did you read the comment? } - diff --git a/hosts/galadriel/hardware-configuration.nix b/hosts/galadriel/hardware-configuration.nix index 47963bd..d77f921 100644 --- a/hosts/galadriel/hardware-configuration.nix +++ b/hosts/galadriel/hardware-configuration.nix @@ -1,30 +1,47 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/7789ad41-d578-40bc-bf86-b761e0a4921e"; - fsType = "btrfs"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/7789ad41-d578-40bc-bf86-b761e0a4921e"; + fsType = "btrfs"; + }; - boot.initrd.luks.devices."NIXROOT".device = "/dev/disk/by-uuid/082790fd-3d4b-4307-8a43-b9c56bd86e03"; + boot.initrd.luks.devices."NIXROOT".device = + "/dev/disk/by-uuid/082790fd-3d4b-4307-8a43-b9c56bd86e03"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3DE0-D86E"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/3DE0-D86E"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; swapDevices = [ ]; diff --git a/hosts/legolas/configuration.nix b/hosts/legolas/configuration.nix index 06c3b96..6da1cb0 100644 --- a/hosts/legolas/configuration.nix +++ b/hosts/legolas/configuration.nix @@ -45,12 +45,10 @@ # Select internationalisation properties. # i18n.defaultLocale = "en_US.UTF-8"; - #testing terminal from printer cable. services.printing.enable = true; boot.kernelModules = [ "usblp" ]; - # Enable the X11 windowing system. services.xserver.enable = true; services.xserver.videoDrivers = [ @@ -67,8 +65,7 @@ enableSSHSupport = true; }; - services.desktopManager.gnome.enable=true; - + services.desktopManager.gnome.enable = true; # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. diff --git a/hosts/legolas/hardware-configuration.nix b/hosts/legolas/hardware-configuration.nix index bb2954b..a489a8a 100644 --- a/hosts/legolas/hardware-configuration.nix +++ b/hosts/legolas/hardware-configuration.nix @@ -1,4 +1,10 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -11,10 +17,15 @@ "mem_sleep_default=deep" ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "uas" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "uas" + "rtsx_pci_sdmmc" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-label/NIXROOT"; @@ -24,11 +35,14 @@ fileSystems."/boot" = { device = "/dev/disk/by-label/NIXBOOT"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; boot.initrd.luks.devices.luks_secure = { - device = "/dev/disk/by-uuid/c21c8089-29a7-4266-a8a6-6e80ccca167c"; + device = "/dev/disk/by-uuid/c21c8089-29a7-4266-a8a6-6e80ccca167c"; crypttabExtraOpts = [ #"tpm2-device=auto" #"tpm2-measure-pcr=yes" @@ -42,11 +56,8 @@ systemd.targets.hibernate.enable = false; #services.logind.lidSwitch = "suspend"; - powerManagement.enable = true; + powerManagement.enable = true; - - - # Disable hibernation systemd.sleep = { extraConfig = '' @@ -55,16 +66,14 @@ AllowSuspendThenHibernate=no ''; }; - + # Disable PCIe wakeups services.udev.extraRules = '' ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled" ''; - - hardware.graphics = { - enable = true; + enable = true; extraPackages = with pkgs; [ vpl-gpu-rt ]; }; diff --git a/modules/blog.nix b/modules/blog.nix index febb05d..6404d70 100644 --- a/modules/blog.nix +++ b/modules/blog.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ pkgs, ... }: { services.blog-generator = { enable = true; contentDir = "/var/lib/www/blog/content"; port = 8080; - }; -} + }; +} diff --git a/modules/develPackages.nix b/modules/develPackages.nix index 7f1f707..616c3ca 100644 --- a/modules/develPackages.nix +++ b/modules/develPackages.nix @@ -46,7 +46,7 @@ python3 python3Packages.uv python3Packages.ipykernel - + python3Packages.flask python3Packages.flask-sqlalchemy python3Packages.flask-socketio @@ -59,7 +59,6 @@ python3Packages.torch python3Packages.litellm python3Packages.pycryptodome - github-copilot-cli diff --git a/modules/displaymanager.nix b/modules/displaymanager.nix index 4cadefa..6b9bab9 100644 --- a/modules/displaymanager.nix +++ b/modules/displaymanager.nix @@ -8,15 +8,15 @@ { imports = [ ]; - environment.systemPackages = [( - pkgs.catppuccin-sddm.override { + environment.systemPackages = [ + (pkgs.catppuccin-sddm.override { flavor = "mocha"; - font = "Noto Sans"; + font = "Noto Sans"; fontSize = "24"; background = "${../home/Wallpapers/1346679.jpg}"; loginBackground = true; - } - )]; + }) + ]; services.displayManager = { enable = true; diff --git a/modules/immich.nix b/modules/immich.nix index e084200..b1a3b00 100644 --- a/modules/immich.nix +++ b/modules/immich.nix @@ -15,7 +15,6 @@ mediaLocation = "/Main/Data/media/pictures"; accelerationDevices = null; - settings = { newVersionCheck.enabled = false; }; diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index ebba24b..db7b42e 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -1,9 +1,14 @@ -{ config, pkgs, lib, ... }: { - users.groups.media.members = ["jellyfin"]; #have media directory owned by media group + config, + pkgs, + lib, + ... +}: +{ + users.groups.media.members = [ "jellyfin" ]; # have media directory owned by media group services.jellyfin = { enable = true; - group = "media"; + group = "media"; openFirewall = true; }; diff --git a/modules/jupyterhub.nix b/modules/jupyterhub.nix index bd41d4e..7653947 100644 --- a/modules/jupyterhub.nix +++ b/modules/jupyterhub.nix @@ -1,33 +1,42 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - myPython = pkgs.python3; + myPython = pkgs.python3; - myJupyterHubEnv = myPython.withPackages (ps: with ps; [ - jupyterhub - jupyterhub-systemdspawner - ipython - jupyterlab - notebook - ipykernel - numpy - scipy - pandas - matplotlib - seaborn - scikit-learn - ]); + myJupyterHubEnv = myPython.withPackages ( + ps: with ps; [ + jupyterhub + jupyterhub-systemdspawner + ipython + jupyterlab + notebook + ipykernel + numpy + scipy + pandas + matplotlib + seaborn + scikit-learn + ] + ); - myJupyterLabEnv = myPython.withPackages (ps: with ps; [ - jupyterhub - jupyterlab - ipykernel - numpy - scipy - pandas - matplotlib - seaborn - scikit-learn - ]); + myJupyterLabEnv = myPython.withPackages ( + ps: with ps; [ + jupyterhub + jupyterlab + ipykernel + numpy + scipy + pandas + matplotlib + seaborn + scikit-learn + ] + ); in { @@ -39,12 +48,12 @@ in python3Packages.seaborn python3Packages.scikit-learn ]; - + users.users.tdt4117 = { isNormalUser = true; home = "/home/tdt4117"; description = "tdt4117 - delete after h25"; - extraGroups = [ ]; + extraGroups = [ ]; # openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... " ]; }; @@ -58,11 +67,14 @@ in c.Authenticator.allow_all = True c.ConfigurableHTTPProxy.api_url = 'http://0.0.0.0:8770' c.JupyterHub.bind_url = 'http://0.0.0.0:8771' - ''; + ''; kernels = { - python3 = let - env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ + python3 = + let + env = ( + pkgs.python3.withPackages ( + pythonPackages: with pythonPackages; [ ipykernel pandas scikit-learn @@ -74,39 +86,37 @@ in numpy scipy + pip + torch + torchvision + lightning + numpy + scipy + matplotlib + scikit-image + jupyterlab + ipykernel + pillow + tqdm + pandas - pip -torch -torchvision -lightning -numpy -scipy -matplotlib -scikit-image -jupyterlab -ipykernel -pillow -tqdm -pandas - - - - - ])); - in { - displayName = "Python 3 for machine learning"; - argv = [ - "${env.interpreter}" - "-m" - "ipykernel_launcher" - "-f" - "{connection_file}" - ]; - language = "python"; - logo32 = "${env}/${env.sitePackages}/ipykernel/resources/logo-32x32.png"; - logo64 = "${env}/${env.sitePackages}/ipykernel/resources/logo-64x64.png"; - }; + ] + ) + ); + in + { + displayName = "Python 3 for machine learning"; + argv = [ + "${env.interpreter}" + "-m" + "ipykernel_launcher" + "-f" + "{connection_file}" + ]; + language = "python"; + logo32 = "${env}/${env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "${env}/${env.sitePackages}/ipykernel/resources/logo-64x64.png"; + }; }; }; } - diff --git a/modules/kdeconnect.nix b/modules/kdeconnect.nix index 33e9d78..7054990 100644 --- a/modules/kdeconnect.nix +++ b/modules/kdeconnect.nix @@ -16,7 +16,12 @@ enable = true; }; networking.firewall = rec { - allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; allowedUDPPortRanges = allowedTCPPortRanges; }; } diff --git a/modules/mealie.nix b/modules/mealie.nix index af29775..c519580 100644 --- a/modules/mealie.nix +++ b/modules/mealie.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { services.mealie = { enable = true; diff --git a/modules/miniflux.nix b/modules/miniflux.nix index 3d32f47..7081d8a 100644 --- a/modules/miniflux.nix +++ b/modules/miniflux.nix @@ -1,13 +1,17 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { - sops.secrets."miniflux/adminCredentialsFile" = { - restartUnits = [ "miniflux.service" ]; - mode = "0755"; - }; + sops.secrets."miniflux/adminCredentialsFile" = { + restartUnits = [ "miniflux.service" ]; + mode = "0755"; + }; - services.miniflux.enable = true; - services.miniflux.config.LISTEN_ADDR = "0.0.0.0:8089"; - services.miniflux.adminCredentialsFile = config.sops.secrets."miniflux/adminCredentialsFile".path; + services.miniflux.enable = true; + services.miniflux.config.LISTEN_ADDR = "0.0.0.0:8089"; + services.miniflux.adminCredentialsFile = config.sops.secrets."miniflux/adminCredentialsFile".path; } - diff --git a/modules/ollama.nix b/modules/ollama.nix index cfcb952..a923022 100644 --- a/modules/ollama.nix +++ b/modules/ollama.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, unstable, ... }: +{ + config, + pkgs, + lib, + unstable, + ... +}: let hostname = config.networking.hostName; diff --git a/modules/openssh.nix b/modules/openssh.nix index 1f6a5db..29a77bc 100644 --- a/modules/openssh.nix +++ b/modules/openssh.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let sshLookup = pkgs.writeShellScriptBin "ssh-lookup-root-pubs" '' #!/bin/sh @@ -27,6 +32,5 @@ in port = 22; openFirewall = true; }; - services.sshguard.enable = true; #protection against brute force attacks + services.sshguard.enable = true; # protection against brute force attacks } - diff --git a/modules/openwebui.nix b/modules/openwebui.nix index 2013cee..5187d07 100644 --- a/modules/openwebui.nix +++ b/modules/openwebui.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let stateDir = "/var/lib/open-webui"; @@ -40,7 +45,6 @@ in WEBUI_HOST = "0.0.0.0"; }; - }; # Create persistent state directories (like StateDirectory in systemd) diff --git a/modules/qbittorrent.nix b/modules/qbittorrent.nix index 9a77b13..c236e6f 100644 --- a/modules/qbittorrent.nix +++ b/modules/qbittorrent.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { sops.secrets."qbittorrent/interfaceAddress" = { restartUnits = [ "qbittorrent-nox.service" ]; @@ -11,11 +16,10 @@ ''; sops.templates."qbittorrent-interface-addr.conf".owner = "qbittorrent"; - users.users.qbittorrent = { group = lib.mkForce "media"; }; - users.groups.qbittorrent = {}; + users.groups.qbittorrent = { }; services.qbittorrent = { enable = true; @@ -25,61 +29,60 @@ serverConfig = { LegalNotice.Accepted = true; - Meta.MigrationVersion=6; - Network.PortForwardingEnabled=true; + Meta.MigrationVersion = 6; + Network.PortForwardingEnabled = true; Preferences = { WebUI = { - AuthSubnetWhitelist="192.168.1.0/24, 100.0.0.0/8"; - AuthSubnetWhitelistEnabled=true; - UseUPnP=false; + AuthSubnetWhitelist = "192.168.1.0/24, 100.0.0.0/8"; + AuthSubnetWhitelistEnabled = true; + UseUPnP = false; }; - BitTorrent = { - Session = { - AddExtensionToIncompleteFiles=true; - AlternativeGlobalDLSpeedLimit=1000; - AlternativeGlobalUPSpeedLimit=1000; - AnonymousModeEnabled=false; - BTProtocol="Both"; - BandwidthSchedulerEnabled=false; - DefaultSavePath="/Main/Data/media/Downloads"; - Encryption=1; - FinishedTorrentExportDirectory="/Main/Data/media/Downloads/torrents-complete"; - GlobalDLSpeedLimit=0; - GlobalMaxRatio=1.5; - GlobalUPSpeedLimit=0; - I2P.Enabled=true; - IgnoreLimitsOnLAN=true; - IncludeOverheadInLimits=true; - Interface="tun0"; - InterfaceAddress="${config.sops.placeholder."qbittorrent/interfaceAddress"}"; - #InterfaceAddress="${interfaceaddress}"; - InterfaceName="tun0"; - LSDEnabled="true"; - MaxActiveCheckingTorrents=15; - MaxRatioAction=1; - Port=44183; - Preallocation=true; - QueueingSystemEnabled=false; - SubcategoriesEnabled=true; - Tags="movie, anime"; - TempPath="/Main/Data/media/Downloads/temp"; - TempPathEnabled=true; - TorrentContentLayout="Subfolder"; - TorrentExportDirectory="/Main/Data/media/Downloads/torrents"; - UseAlternativeGlobalSpeedLimit=false; + BitTorrent = { + Session = { + AddExtensionToIncompleteFiles = true; + AlternativeGlobalDLSpeedLimit = 1000; + AlternativeGlobalUPSpeedLimit = 1000; + AnonymousModeEnabled = false; + BTProtocol = "Both"; + BandwidthSchedulerEnabled = false; + DefaultSavePath = "/Main/Data/media/Downloads"; + Encryption = 1; + FinishedTorrentExportDirectory = "/Main/Data/media/Downloads/torrents-complete"; + GlobalDLSpeedLimit = 0; + GlobalMaxRatio = 1.5; + GlobalUPSpeedLimit = 0; + I2P.Enabled = true; + IgnoreLimitsOnLAN = true; + IncludeOverheadInLimits = true; + Interface = "tun0"; + InterfaceAddress = "${config.sops.placeholder."qbittorrent/interfaceAddress"}"; + #InterfaceAddress="${interfaceaddress}"; + InterfaceName = "tun0"; + LSDEnabled = "true"; + MaxActiveCheckingTorrents = 15; + MaxRatioAction = 1; + Port = 44183; + Preallocation = true; + QueueingSystemEnabled = false; + SubcategoriesEnabled = true; + Tags = "movie, anime"; + TempPath = "/Main/Data/media/Downloads/temp"; + TempPathEnabled = true; + TorrentContentLayout = "Subfolder"; + TorrentExportDirectory = "/Main/Data/media/Downloads/torrents"; + UseAlternativeGlobalSpeedLimit = false; + }; }; - }; - RSS = { - AutoDownloader = { - DownloadRepacks=true; - EnableProcessing=true; - SmartEpisodeFilter="s(\\d+)e(\\d+), (\\d+)x(\\d+), \"(\\d{4}[.\\-]\\d{1,2}[.\\-]\\d{1,2})\", \"(\\d{1,2}[.\\-]\\d{1,2}[.\\-]\\d{4})\""; + RSS = { + AutoDownloader = { + DownloadRepacks = true; + EnableProcessing = true; + SmartEpisodeFilter = "s(\\d+)e(\\d+), (\\d+)x(\\d+), \"(\\d{4}[.\\-]\\d{1,2}[.\\-]\\d{1,2})\", \"(\\d{1,2}[.\\-]\\d{1,2}[.\\-]\\d{4})\""; + }; + Session.EnableProcessing = true; }; - Session.EnableProcessing=true; - }; General.Locale = "en"; }; }; }; } - diff --git a/modules/rtlsdr.nix b/modules/rtlsdr.nix index 19c4acd..6e43bc5 100644 --- a/modules/rtlsdr.nix +++ b/modules/rtlsdr.nix @@ -8,7 +8,7 @@ { hardware.rtl-sdr.enable = true; - + environment.systemPackages = with pkgs; [ libusb1 pkgs.rtl-sdr diff --git a/modules/unstable.nix b/modules/unstable.nix index a34cae9..e213ca6 100644 --- a/modules/unstable.nix +++ b/modules/unstable.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, system, ... }: +{ + config, + pkgs, + inputs, + system, + ... +}: let unstableOverlay = final: prev: { @@ -7,8 +13,7 @@ let config = prev.config; }; }; -in { +in +{ nixpkgs.overlays = [ unstableOverlay ]; } - - diff --git a/modules/vaultvarden.nix b/modules/vaultvarden.nix index a5d75d2..cd8af25 100644 --- a/modules/vaultvarden.nix +++ b/modules/vaultvarden.nix @@ -1,21 +1,26 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { - environment.systemPackages = [ - pkgs.system-sendmail - ]; + environment.systemPackages = [ + pkgs.system-sendmail + ]; - sops.secrets."vaultwarden/environmentFile" = { - restartUnits = [ "vaultwarden.service" ]; - owner = "vaultwarden"; - mode = "0755"; - }; + sops.secrets."vaultwarden/environmentFile" = { + restartUnits = [ "vaultwarden.service" ]; + owner = "vaultwarden"; + mode = "0755"; + }; - services.vaultwarden = { - enable = true; - environmentFile = config.sops.secrets."vaultwarden/environmentFile".path; - dbBackend = "sqlite"; - backupDir = "/var/backup/vaultwarden"; - }; + services.vaultwarden = { + enable = true; + environmentFile = config.sops.secrets."vaultwarden/environmentFile".path; + dbBackend = "sqlite"; + backupDir = "/var/backup/vaultwarden"; + }; } diff --git a/modules/websdr.nix b/modules/websdr.nix index 5cf4191..da257ed 100644 --- a/modules/websdr.nix +++ b/modules/websdr.nix @@ -8,6 +8,6 @@ { hardware.rtl-sdr.enable = true; - services.openwebrx.enable = true; + services.openwebrx.enable = true; } diff --git a/modules/xdg.nix b/modules/xdg.nix index 4bcd0d6..9555a16 100644 --- a/modules/xdg.nix +++ b/modules/xdg.nix @@ -14,9 +14,9 @@ xdg = { autostart.enable = true; - menus.enable= true; - icons.enable= true; - sounds.enable= true; + menus.enable = true; + icons.enable = true; + sounds.enable = true; portal = { enable = true; xdgOpenUsePortal = true; diff --git a/modules/zfs.nix b/modules/zfs.nix index 8a3fb28..89c3a81 100644 --- a/modules/zfs.nix +++ b/modules/zfs.nix @@ -1,5 +1,10 @@ -{ config, pkgs, lib, ... }: -{ +{ + config, + pkgs, + lib, + ... +}: +{ boot.supportedFilesystems = [ "zfs" ]; boot.zfs.forceImportRoot = false; networking.hostId = "1ccccd3a"; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index df7d6a3..e623099 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -3,7 +3,7 @@ acme: certs: ENC[AES256_GCM,data:v3eIoxXPCGU3nnj9LbpC6q9TIbmw0pwlBCjyfsmMxAMgp5oZttHUimXU3jmrFSDNLMXKyKp5ibBpL+pJDl+HGXbZ2ERWUfV0xqI+vUWetnO8tN4VrW0NZNs/TxdwdTVEA/st8zYON+Qnxrd0xUYAz2TzM9T4cEaRCpTKdIg=,iv:dnct9KU24ZVaQThA6rTTClRjT+vTi4aD+7UV+oiqoVU=,tag:eFmep+I41nVf51/i3v/53Q==,type:str] github: - api: ENC[AES256_GCM,data:cX6+tGgEvM06jfkP1KhYi09sLsvJV7fUZoyn1d9oDb1fRVfq5E0r2FVlowz33aWvUds2d0K+hlV8KizN1gDvp/HBky72+LTNUxiqS5MKLzJTAuYVqDBZJnWRB7jJNKI1Uz3XAPzu35jNVoMltstdOwbKTmrygwUzjy26Q11SUQ==,iv:bVdSkDeUkqdMvZN8iuFBbJ+oO2hC4164pFYKjOOeNLo=,tag:/M4f7AXGBWUqP4zKakmBkw==,type:str] + api: ENC[AES256_GCM,data:PcalL0rNd0nfNPMlWP05FWh3ff6rp5eQUmu3NzKmuSPcS5w6zSKCLsoCegltENjTWomGAJDoJF8rYfE3tTo4xQBAzFsK7v3GFXfefB+Ec7/FrUT6jjcHK4+c0e1u3cAgUkFpKq+IzS0yDBgMtXuC5oRzw0u0cEjXT4akiyO9Hg==,iv:GVPXrS9gwpw5JgsO6+YAMT96CsX7dz0NAcaq/IxXzec=,tag:Vxb4LOf0mm52W7Ege7mi6A==,type:str] nginx: defaultpass: ENC[AES256_GCM,data:dJn/Q0jV83PgfFH2ODJO/nXGqew2TZG3ItudJZQ/eCo7Ek2IPlHHQq52bzaVYPqhxUsvXpLV9FgR3FQVOHyiUK3MBsLDNvCTzpnALSflnpj0nKqrXWg3YgEKfi+FdHQ1s0SFQqBOsEw+Xt6eWkNykrl9Jgq5UF7Bp4iC4jmDwQeAFIWaIsWK0117X4seBRQc5rxz1XYNsTaVTzp102I1QmrWLRHGjuvpT5jLVvNEoaU/imT+beAmQAnq5pFOMiEwd4q5FFUdy8XHi7CcT4fql92m2I61pgQbjnHwGklLZvRYO5gIKLwj7u19x8lnFBefDoAshuZOch8397T+vjTxVe0fsuZeLAtLXdPKwoF3L0jp4ffNmPq8H3BTnFwJ2NZo,iv:h6gn2VKancyy6dZlON99zjRj4smArwt6I4a3PRjGfZ8=,tag:Gt4yl0zK7vF3Is/g8cow0g==,type:str] qbittorrent: @@ -46,7 +46,7 @@ sops: TEhuRFBFQUppVjFKL3JKa0ozNmRLcTAKDrrS8mpHoQoZ54VkY+SYbjoE6AS0fLjc uHuFCrUWqQIwfqHXGlXn7EPUweTfwQ7Od+4JeVp1GbgNLIyH5xNN1g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-01T13:31:39Z" - mac: ENC[AES256_GCM,data:mj+2/Hl7xIZZZLdi1S7IY5VCXjR/5PbBtLVoY/4IxwHMrdGWtZdhkvgslsbFDiK+z/o0ocofTuBAn/AnHz+tBfKWF50q6sVAQYhMayQl/cFj34dhTbvrfmLAp3dnUdrOs5qa61dwmkKu51dxr22NESv4zZ96hOL1qYjq6xMSaNE=,iv:ZHnqSEI9nesJNBa4fLJkreuT6tqXlhsfUhuoR5Ydj1E=,tag:XsNJOR5eC6obwTRiJV5zRQ==,type:str] + lastmodified: "2025-12-01T15:16:22Z" + mac: ENC[AES256_GCM,data:e+nLoUc3ybRoznmQqUdEF01dOIPleG7Hxv9U05f2y68eLo+QzP8/dznIhdc8DC4dAB7IkS4qXGiCyyWfzhVTPy8Aor4pAO0wwHR3cylKswetX0RVJErRO2r6mDMz6bjOseo1WZ6Jq6EOo2Z0SZli+lnLrxTpnoVDlOL6XO6TP2A=,iv:57LHCw0SY5cG2woS5op378RhhgqJGSRhA8oO+76/maM=,tag:aYs9KnXSQyRyawRcc+MITw==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0