diff options
| -rwxr-xr-x | flake.lock | 63 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | modules/features/browser.nix | 167 | ||||
| -rw-r--r-- | modules/features/ngeNoctalia.json | 686 | ||||
| -rw-r--r-- | modules/features/niri.nix | 7 | ||||
| -rw-r--r-- | modules/features/noctalia.nix | 7 | ||||
| -rw-r--r-- | modules/hosts/herra/configuration.nix | 4 | ||||
| -rw-r--r-- | modules/system/keyboard.nix | 6 | ||||
| -rw-r--r-- | modules/system/keys.nix | 2 |
9 files changed, 914 insertions, 32 deletions
@@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -156,6 +156,26 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781989573, + "narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "import-tree": { "locked": { "lastModified": 1778781969, @@ -250,11 +270,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -266,6 +286,7 @@ "root": { "inputs": { "flake-parts": "flake-parts", + "home-manager": "home-manager", "import-tree": "import-tree", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -340,11 +361,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "type": "github" }, "original": { @@ -356,11 +377,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "type": "github" }, "original": { @@ -372,11 +393,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", "type": "github" }, "original": { @@ -1,6 +1,10 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; diff --git a/modules/features/browser.nix b/modules/features/browser.nix new file mode 100644 index 0000000..e24f252 --- /dev/null +++ b/modules/features/browser.nix @@ -0,0 +1,167 @@ +{inputs, ...}: let + extensions = { + core = [ + "ublock-origin" + "privacybadger" + "cleanurls" + "sidebery" + ]; + security = [ + "bitwarden-password-manager" + ]; + qol = [ + "dark-reader" + "stylus" + ]; + youtube = [ + "sponsorblock" + "return-youtube-dislikes" + ]; + }; + + mkExt = names: + map ( + name: "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi" + ) + names; +in { + # ----------------------------- + # NIXOS MODULE + # ----------------------------- + flake.nixosModules.browser = { + lib, + pkgs, + self, + ... + }: { + home-manager.users.mun = { + programs.librewolf = { + enable = true; + package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.librewolf-sandboxed; + + languagePacks = ["en-GB" "cs" "sk" "de"]; + + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableFeedbackCommands = true; + + DefaultDownloadDirectory = "\${home}/Downloads"; + + # ----------------------------- + # EXTENSIONS + # ----------------------------- + Extensions.Install = mkExt (extensions.core ++ extensions.security ++ extensions.youtube); + + Extensions.Uninstall = [ + "google@search.mozilla.org" + "bing@search.mozilla.org" + "ddg@search.mozilla.org" + ]; + }; + + profiles = { + # ------------------------- + # 1. DAILY PROFILE (mun) + # ------------------------- + mun = { + isDefault = true; + + search = { + force = true; + default = "duckduckbleh"; + + engines = { + "duckduckbleh" = { + urls = [ + { + template = "https://noai.duckduckgo.com/"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["duck" "d"]; + }; + }; + }; + + settings = { + "signon.rememberSignons" = false; + "browser.startup.homepage" = "about:blank"; + }; + }; + + # ------------------------- + # 2. WORK PROFILE + # ------------------------- + work = { + isDefault = false; + + settings = { + # more permissive (auth sites break otherwise) + "signon.rememberSignons" = true; + "network.cookie.lifetimePolicy" = 0; + }; + }; + + # ------------------------- + # 3. SCHOOL PROFILE + # ------------------------- + school = { + isDefault = false; + + settings = { + "signon.rememberSignons" = true; + "privacy.clearOnShutdown.cookies" = false; + }; + }; + + # ------------------------- + # 4. OPSEC PROFILE (STRICT) + # ------------------------- + opsec = { + isDefault = false; + + settings = { + "signon.rememberSignons" = false; + "network.cookie.lifetimePolicy" = 2; + + "privacy.clearOnShutdown.cookies" = true; + "privacy.clearOnShutdown.history" = true; + }; + }; + }; + + # GLOBAL BASELINE (applies to all profiles) + settings = { + "privacy.trackingprotection.enabled" = true; + "network.dns.disablePrefetch" = true; + "browser.send_pings" = false; + "dom.security.https_only_mode" = true; + "privacy.resistFingerprinting" = true; + }; + }; + }; + }; + + perSystem = {pkgs, ...}: { + packages.librewolf-sandboxed = pkgs.writeShellScriptBin "librewolf" '' + exec ${pkgs.bubblewrap}/bin/bwrap \ + --unshare-all \ + --die-with-parent \ + --proc /proc \ + --dev /dev \ + --tmpfs /tmp \ + --ro-bind /nix/store /nix/store \ + --dir $HOME \ + --setenv HOME $HOME \ + --setenv MOZ_ENABLE_WAYLAND 1 \ + ${pkgs.librewolf}/bin/librewolf "$@" + ''; + }; +} diff --git a/modules/features/ngeNoctalia.json b/modules/features/ngeNoctalia.json new file mode 100644 index 0000000..9dfea92 --- /dev/null +++ b/modules/features/ngeNoctalia.json @@ -0,0 +1,686 @@ +{ + "settingsVersion": 59, + "bar": { + "barType": "floating", + "position": "top", + "monitors": [], + "density": "default", + "showOutline": false, + "showCapsule": true, + "capsuleOpacity": 0.14, + "capsuleColorKey": "secondary", + "widgetSpacing": 10, + "contentPadding": 0, + "fontScale": 1, + "enableExclusionZoneInset": true, + "backgroundOpacity": 0.93, + "useSeparateOpacity": true, + "marginVertical": 7, + "marginHorizontal": 9, + "frameThickness": 8, + "frameRadius": 12, + "outerCorners": true, + "hideOnOverview": false, + "displayMode": "non_exclusive", + "autoHideDelay": 500, + "autoShowDelay": 150, + "showOnWorkspaceSwitch": true, + "widgets": { + "left": [ + { + "compactMode": true, + "diskPath": "/", + "iconColor": "none", + "id": "SystemMonitor", + "showCpuCores": false, + "showCpuFreq": false, + "showCpuTemp": true, + "showCpuUsage": true, + "showDiskAvailable": false, + "showDiskUsage": false, + "showDiskUsageAsPercent": false, + "showGpuTemp": false, + "showLoadAverage": false, + "showMemoryAsPercent": false, + "showMemoryUsage": true, + "showNetworkStats": false, + "showSwapUsage": false, + "textColor": "none", + "useMonospaceFont": true, + "usePadding": false + }, + { + "defaultSettings": { + "precision": 8, + "showBarValue": true + }, + "id": "plugin:noctalia-calculator" + }, + { + "compactMode": false, + "hideMode": "hidden", + "hideWhenIdle": false, + "id": "MediaMini", + "maxWidth": 145, + "panelShowAlbumArt": true, + "scrollingMode": "hover", + "showAlbumArt": true, + "showArtistFirst": true, + "showProgressRing": true, + "showVisualizer": false, + "textColor": "none", + "useFixedWidth": false, + "visualizerType": "linear" + }, + { + "colorizeIcons": false, + "hideMode": "hidden", + "id": "ActiveWindow", + "maxWidth": 145, + "scrollingMode": "hover", + "showIcon": true, + "showText": true, + "textColor": "none", + "useFixedWidth": false + } + ], + "center": [ + { + "clockColor": "none", + "customFont": "", + "formatHorizontal": "HH:mm ddd, MMM dd", + "formatVertical": "HH mm - dd MM", + "id": "Clock", + "tooltipFormat": "HH:mm ddd, MMM dd", + "useCustomFont": false + } + ], + "right": [ + { + "displayMode": "onhover", + "iconColor": "none", + "id": "Volume", + "middleClickCommand": "pwvucontrol || pavucontrol", + "textColor": "none" + }, + { + "displayMode": "onhover", + "iconColor": "none", + "id": "Microphone", + "middleClickCommand": "pwvucontrol || pavucontrol", + "textColor": "none" + }, + { + "applyToAllMonitors": false, + "displayMode": "onhover", + "iconColor": "none", + "id": "Brightness", + "textColor": "none" + }, + { + "hideWhenZero": false, + "hideWhenZeroUnread": false, + "iconColor": "none", + "id": "NotificationHistory", + "showUnreadBadge": true, + "unreadBadgeColor": "primary" + }, + { + "characterCount": 2, + "colorizeIcons": false, + "emptyColor": "secondary", + "enableScrollWheel": true, + "focusedColor": "primary", + "followFocusedScreen": false, + "fontWeight": "bold", + "groupedBorderOpacity": 1, + "hideUnoccupied": false, + "iconScale": 0.8, + "id": "Workspace", + "labelMode": "index", + "occupiedColor": "secondary", + "pillSize": 0.6, + "showApplications": false, + "showApplicationsHover": false, + "showBadge": true, + "showLabelsOnlyWhenOccupied": true, + "unfocusedIconsOpacity": 1 + }, + { + "blacklist": [], + "chevronColor": "none", + "colorizeIcons": false, + "drawerEnabled": true, + "hidePassive": false, + "id": "Tray", + "pinned": [] + }, + { + "colorizeDistroLogo": false, + "colorizeSystemIcon": "none", + "colorizeSystemText": "none", + "customIconPath": "", + "enableColorization": false, + "icon": "noctalia", + "id": "ControlCenter", + "useDistroLogo": false + } + ] + }, + "mouseWheelAction": "volume", + "reverseScroll": false, + "mouseWheelWrap": true, + "middleClickAction": "controlCenter", + "middleClickFollowMouse": false, + "middleClickCommand": "", + "rightClickAction": "launcherPanel", + "rightClickFollowMouse": true, + "rightClickCommand": "", + "screenOverrides": [] + }, + "general": { + "avatarImage": "/home/mun/Documents/4_Configuration/assets/wallpapers/xenia.jpg", + "dimmerOpacity": 0, + "showScreenCorners": false, + "forceBlackScreenCorners": false, + "scaleRatio": 0.9, + "radiusRatio": 1, + "iRadiusRatio": 1, + "boxRadiusRatio": 1, + "screenRadiusRatio": 1, + "animationSpeed": 1.5, + "animationDisabled": false, + "compactLockScreen": false, + "lockScreenAnimations": true, + "lockOnSuspend": true, + "showSessionButtonsOnLockScreen": true, + "showHibernateOnLockScreen": true, + "enableLockScreenMediaControls": false, + "enableShadows": false, + "enableBlurBehind": true, + "shadowDirection": "bottom_right", + "shadowOffsetX": 2, + "shadowOffsetY": 3, + "language": "en-GB", + "allowPanelsOnScreenWithoutBar": true, + "showChangelogOnStartup": true, + "telemetryEnabled": false, + "enableLockScreenCountdown": false, + "lockScreenCountdownDuration": 10000, + "autoStartAuth": false, + "allowPasswordWithFprintd": false, + "clockStyle": "digital", + "clockFormat": "hh\\nmm", + "passwordChars": true, + "lockScreenMonitors": [], + "lockScreenBlur": 0.9, + "lockScreenTint": 0.5, + "keybinds": { + "keyUp": [ + "Up" + ], + "keyDown": [ + "Down" + ], + "keyLeft": [ + "Left" + ], + "keyRight": [ + "Right" + ], + "keyEnter": [ + "Return", + "Enter" + ], + "keyEscape": [ + "Esc" + ], + "keyRemove": [ + "Del" + ] + }, + "reverseScroll": false, + "smoothScrollEnabled": true + }, + "ui": { + "fontDefault": "Sans Serif", + "fontFixed": "monospace", + "fontDefaultScale": 1, + "fontFixedScale": 1, + "tooltipsEnabled": true, + "scrollbarAlwaysVisible": false, + "boxBorderEnabled": false, + "panelBackgroundOpacity": 0.93, + "translucentWidgets": false, + "panelsAttachedToBar": true, + "settingsPanelMode": "attached", + "settingsPanelSideBarCardStyle": false + }, + "location": { + "name": "Prague", + "weatherEnabled": true, + "weatherShowEffects": true, + "weatherTaliaMascotAlways": false, + "useFahrenheit": false, + "use12hourFormat": false, + "showWeekNumberInCalendar": false, + "showCalendarEvents": true, + "showCalendarWeather": true, + "analogClockInCalendar": false, + "firstDayOfWeek": -1, + "hideWeatherTimezone": false, + "hideWeatherCityName": false, + "autoLocate": false + }, + "calendar": { + "cards": [ + { + "enabled": true, + "id": "calendar-header-card" + }, + { + "enabled": true, + "id": "calendar-month-card" + }, + { + "enabled": true, + "id": "weather-card" + } + ] + }, + "wallpaper": { + "enabled": true, + "overviewEnabled": true, + "directory": "/home/mun/Documents/4_Configuration/assets/wallpapers", + "monitorDirectories": [], + "enableMultiMonitorDirectories": false, + "showHiddenFiles": false, + "viewMode": "recursive", + "setWallpaperOnAllMonitors": true, + "linkLightAndDarkWallpapers": true, + "fillMode": "crop", + "fillColor": "#002c4c", + "useSolidColor": false, + "solidColor": "#1a1a2e", + "automationEnabled": false, + "wallpaperChangeMode": "random", + "randomIntervalSec": 300, + "transitionDuration": 1500, + "transitionType": [ + "fade", + "disc", + "stripes", + "wipe", + "pixelate", + "honeycomb" + ], + "skipStartupTransition": false, + "transitionEdgeSmoothness": 0.05, + "panelPosition": "follow_bar", + "hideWallpaperFilenames": true, + "useOriginalImages": false, + "overviewBlur": 0.4, + "overviewTint": 0.6, + "useWallhaven": false, + "wallhavenQuery": "", + "wallhavenSorting": "relevance", + "wallhavenOrder": "desc", + "wallhavenCategories": "111", + "wallhavenPurity": "100", + "wallhavenRatios": "", + "wallhavenApiKey": "", + "wallhavenResolutionMode": "atleast", + "wallhavenResolutionWidth": "", + "wallhavenResolutionHeight": "", + "sortOrder": "name", + "favorites": [] + }, + "appLauncher": { + "enableClipboardHistory": true, + "autoPasteClipboard": false, + "enableClipPreview": true, + "clipboardWrapText": true, + "enableClipboardSmartIcons": true, + "enableClipboardChips": true, + "clipboardWatchTextCommand": "wl-paste --type text --watch cliphist store", + "clipboardWatchImageCommand": "wl-paste --type image --watch cliphist store", + "position": "center", + "pinnedApps": [], + "sortByMostUsed": true, + "terminalCommand": "alacritty -e", + "customLaunchPrefixEnabled": false, + "customLaunchPrefix": "", + "viewMode": "list", + "showCategories": true, + "iconMode": "native", + "showIconBackground": false, + "enableSettingsSearch": true, + "enableWindowsSearch": true, + "enableSessionSearch": true, + "ignoreMouseInput": false, + "screenshotAnnotationTool": "", + "overviewLayer": false, + "density": "default" + }, + "controlCenter": { + "position": "close_to_bar_button", + "diskPath": "/", + "shortcuts": { + "left": [ + { + "id": "Network" + }, + { + "id": "Bluetooth" + }, + { + "id": "WallpaperSelector" + }, + { + "id": "NoctaliaPerformance" + } + ], + "right": [ + { + "id": "Notifications" + }, + { + "id": "PowerProfile" + }, + { + "id": "KeepAwake" + }, + { + "id": "NightLight" + } + ] + }, + "cards": [ + { + "enabled": true, + "id": "profile-card" + }, + { + "enabled": true, + "id": "shortcuts-card" + }, + { + "enabled": true, + "id": "audio-card" + }, + { + "enabled": true, + "id": "brightness-card" + }, + { + "enabled": true, + "id": "weather-card" + }, + { + "enabled": true, + "id": "media-sysmon-card" + } + ] + }, + "systemMonitor": { + "cpuWarningThreshold": 80, + "cpuCriticalThreshold": 90, + "tempWarningThreshold": 80, + "tempCriticalThreshold": 90, + "gpuWarningThreshold": 80, + "gpuCriticalThreshold": 90, + "memWarningThreshold": 80, + "memCriticalThreshold": 90, + "swapWarningThreshold": 80, + "swapCriticalThreshold": 90, + "diskWarningThreshold": 80, + "diskCriticalThreshold": 90, + "diskAvailWarningThreshold": 20, + "diskAvailCriticalThreshold": 10, + "batteryWarningThreshold": 20, + "batteryCriticalThreshold": 5, + "enableDgpuMonitoring": true, + "useCustomColors": false, + "warningColor": "#a166cc", + "criticalColor": "#fd4663", + "externalMonitor": "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor" + }, + "noctaliaPerformance": { + "disableWallpaper": false, + "disableDesktopWidgets": false + }, + "dock": { + "enabled": false, + "position": "bottom", + "displayMode": "auto_hide", + "dockType": "floating", + "backgroundOpacity": 1, + "floatingRatio": 1.3, + "size": 1, + "onlySameOutput": true, + "monitors": [ + "DP-3" + ], + "pinnedApps": [], + "colorizeIcons": true, + "showLauncherIcon": false, + "launcherPosition": "end", + "launcherUseDistroLogo": false, + "launcherIcon": "", + "launcherIconColor": "none", + "pinnedStatic": false, + "inactiveIndicators": false, + "groupApps": false, + "groupContextMenuMode": "extended", + "groupClickAction": "cycle", + "groupIndicatorStyle": "dots", + "deadOpacity": 0.6, + "animationSpeed": 1, + "sitOnFrame": false, + "showDockIndicator": false, + "indicatorThickness": 3, + "indicatorColor": "primary", + "indicatorOpacity": 0.6 + }, + "network": { + "bluetoothRssiPollingEnabled": false, + "bluetoothRssiPollIntervalMs": 60000, + "networkPanelView": "ethernet", + "wifiDetailsViewMode": "grid", + "bluetoothDetailsViewMode": "grid", + "bluetoothHideUnnamedDevices": false, + "disableDiscoverability": false, + "bluetoothAutoConnect": true + }, + "sessionMenu": { + "enableCountdown": true, + "countdownDuration": 10000, + "position": "center", + "showHeader": true, + "showKeybinds": true, + "largeButtonsStyle": true, + "largeButtonsLayout": "single-row", + "powerOptions": [ + { + "action": "lock", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "1" + }, + { + "action": "suspend", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "2" + }, + { + "action": "hibernate", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "3" + }, + { + "action": "reboot", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "4" + }, + { + "action": "logout", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "5" + }, + { + "action": "shutdown", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "6" + }, + { + "action": "rebootToUefi", + "command": "", + "countdownEnabled": true, + "enabled": true, + "keybind": "7" + }, + { + "action": "userspaceReboot", + "command": "", + "countdownEnabled": true, + "enabled": false, + "keybind": "" + } + ] + }, + "notifications": { + "enabled": true, + "enableMarkdown": true, + "density": "default", + "monitors": [ + "DP-4" + ], + "location": "top_right", + "overlayLayer": true, + "backgroundOpacity": 0.3, + "respectExpireTimeout": false, + "lowUrgencyDuration": 3, + "normalUrgencyDuration": 8, + "criticalUrgencyDuration": 15, + "clearDismissed": true, + "saveToHistory": { + "low": true, + "normal": true, + "critical": true + }, + "sounds": { + "enabled": false, + "volume": 0.5, + "separateSounds": false, + "criticalSoundFile": "", + "normalSoundFile": "", + "lowSoundFile": "", + "excludedApps": "discord,firefox,chrome,chromium,edge" + }, + "enableMediaToast": false, + "enableKeyboardLayoutToast": true, + "enableBatteryToast": true + }, + "osd": { + "enabled": true, + "location": "top_right", + "autoHideMs": 2000, + "overlayLayer": true, + "backgroundOpacity": 1, + "enabledTypes": [ + 0, + 1, + 2 + ], + "monitors": [] + }, + "audio": { + "volumeStep": 5, + "volumeOverdrive": true, + "spectrumFrameRate": 60, + "visualizerType": "linear", + "spectrumMirrored": true, + "mprisBlacklist": [], + "preferredPlayer": "spotify, firefox", + "volumeFeedback": false, + "volumeFeedbackSoundFile": "" + }, + "brightness": { + "brightnessStep": 5, + "enforceMinimum": true, + "enableDdcSupport": false, + "backlightDeviceMappings": [] + }, + "colorSchemes": { + "useWallpaperColors": true, + "predefinedScheme": "Dracula", + "darkMode": true, + "schedulingMode": "off", + "manualSunrise": "06:30", + "manualSunset": "18:30", + "generationMethod": "faithful", + "monitorForColors": "", + "syncGsettings": true + }, + "templates": { + "activeTemplates": [], + "enableUserTheming": false + }, + "nightLight": { + "enabled": false, + "forced": false, + "autoSchedule": true, + "nightTemp": "4000", + "dayTemp": "6500", + "manualSunrise": "06:30", + "manualSunset": "18:30" + }, + "hooks": { + "enabled": false, + "wallpaperChange": "", + "darkModeChange": "", + "screenLock": "", + "screenUnlock": "", + "performanceModeEnabled": "", + "performanceModeDisabled": "", + "startup": "", + "session": "", + "colorGeneration": "" + }, + "plugins": { + "autoUpdate": true, + "notifyUpdates": true + }, + "idle": { + "enabled": true, + "screenOffTimeout": 600, + "lockTimeout": 660, + "suspendTimeout": 1800, + "fadeDuration": 5, + "screenOffCommand": "", + "lockCommand": "", + "suspendCommand": "", + "resumeScreenOffCommand": "", + "resumeLockCommand": "", + "resumeSuspendCommand": "", + "customCommands": "[]" + }, + "desktopWidgets": { + "enabled": false, + "overviewEnabled": true, + "gridSnap": false, + "gridSnapScale": false, + "monitorWidgets": [] + } +} diff --git a/modules/features/niri.nix b/modules/features/niri.nix index 435a390..2aa9d38 100644 --- a/modules/features/niri.nix +++ b/modules/features/niri.nix @@ -3,14 +3,14 @@ inputs, ... }: { - flake.nixosModules.niri = { + flake.nixosModules.ngeNiri = { pkgs, lib, ... }: { programs.niri = { enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri; + package = self.packages.${pkgs.stdenv.hostPlatform.system}.ngeNiri; }; }; @@ -34,7 +34,8 @@ binds = { "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty; "Mod+Shift+Q".close-window = {}; - "Mod+S".spawn-sh = "${lib.getExe self'.packages.ngeNoctalia} ipc call launcher toggle"; + "Mod+D".spawn-sh = "${lib.getExe self'.packages.ngeNoctalia} ipc call launcher toggle"; + "Mod+Shift+S".spawn-sh = "${lib.getExe pkgs.niri} msg action screenshot"; }; }; }; diff --git a/modules/features/noctalia.nix b/modules/features/noctalia.nix index 42f489a..8c3b146 100644 --- a/modules/features/noctalia.nix +++ b/modules/features/noctalia.nix @@ -6,9 +6,10 @@ perSystem = {pkgs, ...}: { packages.ngeNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap { inherit pkgs; - # settings = - # (builtins.fromJSON - # (builtins.readFile ./noctalia.json)).settings; + + settings = builtins.fromJSON ( + builtins.readFile ./ngeNoctalia.json + ); }; }; } diff --git a/modules/hosts/herra/configuration.nix b/modules/hosts/herra/configuration.nix index 95e852d..a9b1912 100644 --- a/modules/hosts/herra/configuration.nix +++ b/modules/hosts/herra/configuration.nix @@ -10,8 +10,10 @@ }: { imports = [ self.nixosModules.herraHardware + inputs.home-manager.nixosModules.home-manager self.nixosModules.system - self.nixosModules.niri + self.nixosModules.ngeNiri # NeonGenesisEvangelion rice of niri + self.nixosModules.browser # Configured browser ]; # ... diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix index 1333637..e02bf6b 100644 --- a/modules/system/keyboard.nix +++ b/modules/system/keyboard.nix @@ -3,9 +3,9 @@ lib, ... }: { - flake.nixosModule.keyboard = {...}: { - xkb = { - layout = lib.mkDefauklt "cz"; + flake.nixosModules.keyboard = {...}: { + services.xserver.xkb = { + layout = lib.mkDefault "cz"; options = lib.mkDefault "eurosign:e,caps:escape"; }; }; diff --git a/modules/system/keys.nix b/modules/system/keys.nix index 8c4a38c..28ef552 100644 --- a/modules/system/keys.nix +++ b/modules/system/keys.nix @@ -1,6 +1,6 @@ # Mount and unmount scripts for the encrypted usb drive on my keys for easy access of ssh keys {...}: { - flake.nixosModule.keys = {pkgs, ...}: { + flake.nixosModules.keys = {pkgs, ...}: { systemd.tmpfiles.rules = [ "d /mnt/ssh-keys 0755 root root -" "d /mnt/nixos-config 0755 root root -" |