dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 01fb19578be7dd06428565047e1c7592b1d26765 parent fe8a48d9e125cf484d3072d866549fcef8b9f569 Author: maydayv7 <maydayv7@gmail.com> Date: Thu, 26 Jan 2023 12:59:33 +0530 feat!: Upgrade to NixOS v22.11 (Raccoon)! Changes: - Drop `cod`, `nix-linter` and `mutter-rounded` - Fix GNOME Extensions - Improve XFCE Configuration Handling - Fix Localization Issues
Diffstat:
| M | .version | | | 4 | ++-- |
| M | README.md | | | 44 | +++++++++++++++++++++++++++----------------- |
| M | configuration.nix | | | 6 | +++--- |
| M | devices/Futura.nix | | | 2 | +- |
| M | devices/Vortex.nix | | | 2 | +- |
| M | files/default.nix | | | 8 | +++++--- |
| M | files/gnome/dconf.nix | | | 125 | ++++++++++++++----------------------------------------------------------------- |
| M | files/xfce/panel.txt | | | 14 | ++++---------- |
| D | files/xfce/settings/displays.xml | | | 43 | ------------------------------------------- |
| M | files/xfce/settings/xfce4-desktop.xml | | | 8 | ++++---- |
| M | files/xfce/settings/xfce4-panel.xml | | | 10 | +--------- |
| M | flake.lock | | | 123 | ++++++++++++++++++++++++++++++++++++++++++++----------------------------------- |
| M | flake.nix | | | 12 | ++++++++---- |
| M | modules/base/firmware.nix | | | 1 | + |
| M | modules/default.nix | | | 4 | ++-- |
| M | modules/gui/gnome.nix | | | 19 | +++++++------------ |
| M | modules/gui/xfce.nix | | | 30 | +++++++++++++++--------------- |
| M | modules/gui/xorg.nix | | | 1 | - |
| M | modules/hardware/virtualisation.nix | | | 2 | +- |
| M | modules/nix/checks.nix | | | 26 | +------------------------- |
| M | modules/nix/default.nix | | | 14 | +++++++------- |
| M | modules/nix/format.nix | | | 1 | - |
| M | modules/shell/bash.nix | | | 1 | - |
| M | modules/shell/zsh.nix | | | 38 | +++++++++++++++++--------------------- |
| M | modules/user/passwords/v7.secret | | | 8 | ++++---- |
| M | packages/adw-gtk3.nix | | | 4 | ++-- |
| M | packages/dotfiles.nix | | | 4 | ++-- |
| M | packages/firefox-gnome-theme/metadata.nix | | | 4 | ++-- |
| M | packages/fly-pie.nix | | | 4 | ++-- |
| M | packages/overlays/discord.nix | | | 4 | ++-- |
| D | packages/overlays/gnome-terminal.nix | | | 21 | --------------------- |
| D | packages/overlays/mutter-rounded.nix | | | 43 | ------------------------------------------- |
| A | packages/top-bar-organizer.nix | | | 40 | ++++++++++++++++++++++++++++++++++++++++ |
| M | scripts/nixos.nix | | | 3 | --- |
| M | site/content/anime.md | | | 12 | +++++++----- |
35 files changed, 258 insertions(+), 427 deletions(-)
diff --git a/.version b/.version @@ -1 +1 @@ -22.05 -\ No newline at end of file +22.11 +\ No newline at end of file diff --git a/README.md b/README.md @@ -1,7 +1,7 @@   -   [](https://nixos.org) +   [](https://nixos.org) This [repository](https://github.com/maydayv7/dotfiles) contains the configuration and `dotfiles` for my continuously evolving multi-PC setup (using [Nix](https://nixos.org/)). All the devices I own, controlled by code. It also builds and deploys my website to [maydayv7.tk](https://maydayv7.tk). You can follow along with my [NixOS Desktop](https://maydayv7.tk/series/nixos-desktop/) Series @@ -9,7 +9,7 @@ This [repository](https://github.com/maydayv7/dotfiles) contains the configurati ## Features -[](https://builtwithnix.org) +<img alt="Built with Nix" src="https://raw.githubusercontent.com/nix-community/builtwithnix.org/62897617ceefe428f135e82c3a87ea093e29e045/img/built_with_nix.svg" width="130" height="50"/> - Self-Contained - Device-Agnostic @@ -61,6 +61,7 @@ $ nix flake show github:maydayv7/dotfiles ├───apps │ └───x86_64-linux +│ ├───default: app │ └───nixos: app ├───channels: package repositories ├───checks @@ -70,26 +71,24 @@ github:maydayv7/dotfiles │ ├───activate: derivation 'deploy-rs-check-activate' │ ├───commit: derivation 'pre-commit-run' │ └───schema: derivation 'jsonschema-deploy-system' -├───defaultApp -│ └───x86_64-linux: app -├───defaultPackage -│ └───x86_64-linux: package 'Dotfiles-v7.0' -├───defaultTemplate: template: Simple, Minimal NixOS Configuration ├───deploy: automatc deployments -├───devShell -│ └───x86_64-linux: development environment 'devShell' ├───devShells │ └───x86_64-linux │ ├───cc: development environment 'C' │ ├───commit: development environment 'nix-shell' +│ ├───default: development environment 'devShell' +│ ├───format: development environment 'Formatter' │ ├───go: development environment 'Go' │ ├───java: development environment 'Java' │ ├───lisp: development environment 'Lisp' │ ├───lua: development environment 'Lua' │ ├───python: development environment 'Python' │ ├───rust: development environment 'Rust' -│ └───video: development environment 'Video' +│ ├───video: development environment 'Video' +│ └───website: development environment 'Website' ├───files: 'dotfiles' and program configuration +├───formatter +│ └───x86_64-linux: package 'treefmt-0.4.1' ├───installMedia: device install media ├───legacyPackages │ └───x86_64-linux: omitted (use '--legacy' to show) @@ -108,15 +107,20 @@ github:maydayv7/dotfiles │ ├───shell: NixOS module │ └───user: NixOS module ├───overlays -│ └───nixFlakes: Nixpkgs overlay +│ ├───discord: Nixpkgs overlay +│ ├───gnome-terminal: Nixpkgs overlay +│ ├───google-chrome: Nixpkgs overlay +│ └───miscellaneous: Nixpkgs overlay ├───packages │ └───x86_64-linux -│ ├───dotfiles: package 'Dotfiles-v7.0' +│ ├───adw-gtk3: package 'adw-gtk3-v4.2' +│ ├───dotfiles: package 'Dotfiles-v12.0' │ ├───fonts: package 'fonts-7' +│ ├───nixos: package 'nixos' │ └───website: package 'website-stable' ├───templates -│ ├───extensive: template: My Complete, Extensive NixOS Configuration -│ └───minimal: template: Simple, Minimal NixOS Configuration +│ ├───default: template: Simple, Minimal NixOS Configuration +│ └───extensive: template: My Complete, Extensive NixOS Configuration └───vmConfigurations └───Windows: Virtual Machine ``` @@ -149,8 +153,7 @@ github:maydayv7/dotfiles │ ├── build.nix │ ├── map.nix │ ├── pack.nix -│ ├── types.nix -│ └── xdg.nix +│ └── types.nix └── modules ├── apps ├── base @@ -330,7 +333,7 @@ The system build cache is publicly hosted using [Cachix](https://www.cachix.org) #### Continuous Integration -This repository makes use of [`GitHub Actions`](./.github/workflows) in order to automatically check the configuration syntax on every commit (using [`nix-linter`](https://github.com/Synthetica9/nix-linter) and [`statix`](https://github.com/nerdypepper/statix)) and format it (using [`treefmt`](https://github.com/numtide/treefmt)), update the `inputs` every week, build the configuration and upload the build cache to [Cachix](https://app.cachix.org/cache/maydayv7-dotfiles) as well as publish the Install Media `.iso` to a draft Release upon creation of a tag (You can also find `GitLab CI/CD` configuration in [`.gitlab`](./.gitlab/.gitlab-ci.yml)). A `git` [hook](./.git-hooks) is used to check the commit message to adhere to the [`Conventional Commits`](https://www.conventionalcommits.org) specification +This repository makes use of [`GitHub Actions`](./.github/workflows) in order to automatically check the configuration syntax on every commit (using and [`statix`](https://github.com/nerdypepper/statix)) and format it (using [`treefmt`](https://github.com/numtide/treefmt)), update the `inputs` every week, build the configuration and upload the build cache to [Cachix](https://app.cachix.org/cache/maydayv7-dotfiles) as well as publish the Install Media `.iso` to a draft Release upon creation of a tag (You can also find `GitLab CI/CD` configuration in [`.gitlab`](./.gitlab/.gitlab-ci.yml)). A `git` [hook](./.git-hooks) is used to check the commit message to adhere to the [`Conventional Commits`](https://www.conventionalcommits.org) specification ###### Variables @@ -415,6 +418,13 @@ You can navigate to the `README`'s present in the various directories to know mo <details> <summary><b>Changelog</b></summary> +### 23.xy (v12) + +- Upgrade to NixOS v22.11 (Raccoon)! +- Drop `cod`, `nix-linter` and `mutter-rounded` +- Fix GNOME Extensions +- Improve XFCE Configuration Handling + ### 22.11 (v11) - Upgrade to NixOS v22.05 (Quokka)! diff --git a/configuration.nix b/configuration.nix @@ -73,12 +73,12 @@ in # Overrides overlays = map.modules ./packages/overlays import; - ## Program Configuration and 'dotfiles' ## - files = import ./files lib; - ## Custom Library Functions ## lib = lib.util; + ## Program Configuration and 'dotfiles' ## + files = import ./files lib self.legacyPackages."${head platforms}"; + ## Custom Configuration Modules ## nixosModules = map.modules ./modules import diff --git a/devices/Futura.nix b/devices/Futura.nix @@ -4,7 +4,7 @@ description = "PC - Dell Inspiron 11 3000"; timezone = "Asia/Kolkata"; - locale = "en_IN.UTF-8"; + locale = "IN"; update = "weekly"; kernel = "5_4"; diff --git a/devices/Vortex.nix b/devices/Vortex.nix @@ -5,7 +5,7 @@ channel = "stable"; timezone = "Asia/Kolkata"; - locale = "en_IN.UTF-8"; + locale = "IN"; kernel = "lqx"; kernelModules = ["nvme" "thunderbolt"]; diff --git a/files/default.nix b/files/default.nix @@ -1,6 +1,6 @@ -lib: let +lib: pkgs: let inherit (lib.util) build map; - inherit (builtins) fromJSON readFile; + inherit (builtins) fromJSON readFile replaceStrings; in rec { ## Dotfiles ## # File Paths @@ -93,7 +93,9 @@ in rec { # XFCE Desktop xfce = { css = readFile ./xfce/gtk.css; - settings = ./xfce/settings; + settings = + map.files ./xfce/settings + (file: replaceStrings ["@system" "@desktop"] ["/etc/nixos" "${pkgs.xfce.xfdesktop.outPath}"] (readFile file)) ".xml"; terminal = readFile ./xfce/terminalrc; }; diff --git a/files/gnome/dconf.nix b/files/gnome/dconf.nix @@ -100,7 +100,7 @@ in { "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = { binding = "<Super>t"; - command = "gnome-terminal"; + command = "kgx"; name = "Terminal"; }; @@ -229,6 +229,11 @@ in { enable-mouse-gestures = true; }; + "org/gnome/nautilus/icon-view" = { + captions = ["size" "date_modified" "none"]; + default-zoom-level = "medium"; + }; + "org/gnome/nautilus/preferences" = { click-policy = "single"; default-folder-viewer = "icon-view"; @@ -257,67 +262,6 @@ in { style-scheme-name = "builder-dark"; }; - "org/gnome/builder/terminal" = { - limit-scrollback = false; - scrollback-lines = "uint32 10000"; - }; - - "org/gnome/gitlab/somas/Apostrophe" = { - color-scheme = "dark"; - input-format = "gfm"; - }; - - "org/gnome/terminal/legacy" = { - default-show-menubar = true; - new-tab-position = "next"; - schema-version = 3; - theme-variant = "dark"; - }; - - "org/gnome/terminal/legacy/profiles:" = { - default = "b1dcc9dd-5262-4d8d-a863-c897e6d979b9"; - list = ["b1dcc9dd-5262-4d8d-a863-c897e6d979b9"]; - }; - - "org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9" = { - audible-bell = false; - background-transparency-percent = 8; - backspace-binding = "ascii-delete"; - cursor-blink-mode = "system"; - cursor-shape = "ibeam"; - default-size-columns = 100; - default-size-rows = 30; - delete-binding = "delete-sequence"; - exit-action = "close"; - login-shell = false; - palette = [ - "rgb(23,20,33)" - "rgb(192,28,40)" - "rgb(38,162,105)" - "rgb(162,115,76)" - "rgb(18,72,139)" - "rgb(163,71,186)" - "rgb(42,161,179)" - "rgb(208,207,204)" - "rgb(94,92,100)" - "rgb(246,97,81)" - "rgb(51,209,122)" - "rgb(233,173,12)" - "rgb(42,123,222)" - "rgb(192,97,203)" - "rgb(51,199,222)" - "rgb(255,255,255)" - ]; - scrollback-lines = 70000; - scrollback-unlimited = true; - scrollbar-policy = "always"; - use-custom-command = false; - use-system-font = true; - use-theme-colors = true; - use-transparent-background = true; - visible-name = "Terminal"; - }; - "org/gnome/gedit/preferences/ui".show-tabs-mode = "auto"; "org/gnome/gedit/preferences/editor" = { scheme = "tango-dark"; @@ -338,14 +282,10 @@ in { disable-extension-version-validation = true; disabled-extensions = ["workspace-indicator@gnome-shell-extensions.gcampax.github.com"]; enabled-extensions = [ - "add-username-toppanel@brendaw.com" "AlphabeticalAppGrid@stuarthayhurst" "appindicatorsupport@rgcjonas.gmail.com" "avatar@pawel.swiszcz.com" - "burn-my-windows@schneegans.github.com" "caffeine@patapon.info" - "clipboard-history@alexsaveau.dev" - "color-picker@tuberry" "color-picker@tuberry" "compiz-alike-magic-lamp-effect@hermes83.github.com" "compiz-windows-effect@hermes83.github.com" @@ -358,8 +298,7 @@ in { "just-perfection-desktop@just-perfection" "lock-screen-message@advendradeswanta.gitlab.com" "lockkeys@vaina.lt" - "screenshotlocations.timur@linux.com" - "sound-output-device-chooser@kgshank.net" + "pano@elhan.io" "timepp@zagortenay333" "top-bar-organizer@julian.gse.jsts.xyz" "user-theme@gnome-shell-extensions.gcampax.github.com" @@ -371,7 +310,7 @@ in { "google-chrome.desktop" "org.gnome.Geary.desktop" "org.gnome.Nautilus.desktop" - "org.gnome.Terminal.desktop" + "org.gnome.Console.desktop" "org.gnome.gedit.desktop" "org.gnome.Settings.desktop" ]; @@ -442,15 +381,17 @@ in { "org/gnome/shell/extensions/user-theme".name = "Adwaita"; "org/gnome/shell/extensions/alphabetical-app-grid".folder-order-position = "start"; "org/gnome/shell/extensions/lock-screen-message".message = "Welcome, ${config.credentials.fullname}!"; + "org/gnome/shell/extensions/lockkeys".style = "show-hide"; "org/gnome/shell/extensions/avatar" = { + avatar-shadow = true; avatar-shadow-user-name = false; buttons-icon-size = 20; buttons-position = 50; name-style-dark = false; - set-custom-panel-menu-width = 400; - show-buttons = true; - show-media-center = true; + set-custom-panel-menu-width = 0; + show-buttons = false; + show-media-center = false; show-system-name = false; show-top-image = false; }; @@ -479,14 +420,6 @@ in { persistent-mode = true; }; - "org/gnome/shell/extensions/clipboard-history" = { - disable-down-arrow = true; - paste-on-selection = false; - strip-text = true; - toggle-menu = ["<Super>v"]; - window-width-percentage = 25; - }; - "org/gnome/shell/extensions/custom-hot-corners-extended/misc" = { ws-switch-wrap = true; ws-switch-ignore-last = true; @@ -506,23 +439,10 @@ in { ctrl = true; }; - "org/gnome/shell/extensions/burn-my-windows" = { - close-preview-effect = ""; - destroy-dialogs = true; - fire-color-1 = "rgba(0,110,255,0)"; - fire-color-2 = "rgba(30,111,180,0.24)"; - fire-color-3 = "rgba(38,181,255,0.54)"; - fire-color-4 = "rgba(34,162,255,0.84)"; - fire-color-5 = "rgb(97,189,255)"; - flame-movement-speed = -0.1; - flame-scale = 1.5; - open-preview-effect = ""; - tv-open-effect = true; - }; - "org/gnome/shell/extensions/desktop-cube" = { active-workpace-opacity = 195; depth-separation = 25; + enable-desktop-edge-switch = false; horizontal-stretch = 100; inactive-workpace-opacity = 224; overview-transition-time = 0; @@ -532,9 +452,9 @@ in { }; "org/gnome/shell/extensions/gtile" = { - show-icon = false; + show-icon = true; target-presets-to-monitor-of-mouse = true; - theme = "Default"; + theme = "Minimal Dark"; window-margin = 2; window-margin-fullscreen-enabled = true; }; @@ -554,12 +474,11 @@ in { workspace-wrap-around = true; }; - "org/gnome/shell/extensions/lockkeys".style = "show-hide"; - "org/gnome/shell/extensions/screenshotlocations".save-directory = "${homeDir}/Pictures/Screenshots"; - - "org/gnome/shell/extensions/sound-output-device-chooser" = { - expand-volume-menu = false; - hide-on-single-device = true; + "org/gnome/shell/extensions/pano" = { + database-location = "${homeDir}/.local/share/clipboard"; + global-shortcut = ["<Super>v"]; + history-length = 250; + incognito-shortcut = ["<Ctrl><Super>v"]; }; "org/gnome/shell/extensions/timepp" = { @@ -586,7 +505,7 @@ in { "vitalsMenu" "dwellClick" "lockkeys" - "Clipboard History Indicator" + "pano@elhan.io" "a11y" "keyboard" "screenRecording" diff --git a/files/xfce/panel.txt b/files/xfce/panel.txt @@ -1,5 +1,4 @@ -# Panel Configuration Backup -# Compress using 'bunzip2' +# xfce4 Panel Configuration /configver 2 /panels [<0>] @@ -16,7 +15,7 @@ /panels/panel-0/length-adjust true /panels/panel-0/mode uint32 0 /panels/panel-0/nrows uint32 1 -/panels/panel-0/plugin-ids [<1>, <15>, <22>, <18>, <3>, <16>, <4>, <19>, <17>, <2>, <6>, <5>, <7>, <8>, <20>, <9>, <10>, <11>, <13>, <14>] +/panels/panel-0/plugin-ids [<1>, <15>, <22>, <18>, <12>, <3>, <4>, <19>, <17>, <2>, <6>, <5>, <7>, <8>, <20>, <9>, <10>, <11>, <13>, <14>] /panels/panel-0/position 'p=0;x=946;y=27' /panels/panel-0/position-locked true /panels/panel-0/size uint32 27 @@ -34,12 +33,12 @@ /plugins/plugin-11 'separator' /plugins/plugin-11/expand false /plugins/plugin-11/style uint32 0 +/plugins/plugin-12 'pager' /plugins/plugin-13 'notification-plugin' /plugins/plugin-14 'separator' /plugins/plugin-14/expand false /plugins/plugin-14/style uint32 0 /plugins/plugin-15 'whiskermenu' -/plugins/plugin-16 'namebar' /plugins/plugin-17 'xfce4-notes-plugin' /plugins/plugin-18 'eyes' /plugins/plugin-19 'screenshooter' @@ -48,11 +47,7 @@ /plugins/plugin-20/cache-max-age 172800 /plugins/plugin-20/forecast/days 5 /plugins/plugin-20/forecast/layout 1 -/plugins/plugin-20/location/latitude '17.425400' -/plugins/plugin-20/location/longitude '78.507500' -/plugins/plugin-20/location/name 'Hyderabad, India' /plugins/plugin-20/msl 529 -/plugins/plugin-20/offset '+05:30' /plugins/plugin-20/power-saving true /plugins/plugin-20/round true /plugins/plugin-20/scrollbox/animate true @@ -61,8 +56,7 @@ /plugins/plugin-20/scrollbox/show true /plugins/plugin-20/scrollbox/use-color false /plugins/plugin-20/single-row true -/plugins/plugin-20/theme-dir '/nix/store/qrb3nm6l6mz283ifjchn2idw2d7l8mi5-xfce4-weather-plugin-0.11.0/share/xfce4/weather/icons/liquid' -/plugins/plugin-20/timezone 'Asia/Kolkata' +/plugins/plugin-20/theme-dir '/run/current-system/sw/share/xfce4/weather/icons/liquid' /plugins/plugin-20/tooltip-style 1 /plugins/plugin-20/units/altitude 0 /plugins/plugin-20/units/apparent-temperature 0 diff --git a/files/xfce/settings/displays.xml b/files/xfce/settings/displays.xml @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="displays" version="1.0"> - <property name="ActiveProfile" type="string" value="Default"/> - <property name="Default" type="empty"> - <property name="eDP-1" type="string" value="Laptop"> - <property name="Active" type="bool" value="true"/> - <property name="EDID" type="string" value="20cc2f86e84952dfcf73faae3bac5b85946de04f"/> - <property name="Resolution" type="string" value="1920x1080"/> - <property name="RefreshRate" type="double" value="59.998611"/> - <property name="Rotation" type="int" value="0"/> - <property name="Reflection" type="string" value="0"/> - <property name="Primary" type="bool" value="true"/> - <property name="Scale" type="empty"> - <property name="X" type="double" value="1.000000"/> - <property name="Y" type="double" value="1.000000"/> - </property> - <property name="Position" type="empty"> - <property name="X" type="int" value="0"/> - <property name="Y" type="int" value="0"/> - </property> - </property> - </property> - <property name="Fallback" type="empty"> - <property name="eDP-1" type="string" value="Laptop"> - <property name="Active" type="bool" value="true"/> - <property name="EDID" type="string" value="20cc2f86e84952dfcf73faae3bac5b85946de04f"/> - <property name="Resolution" type="string" value="1920x1080"/> - <property name="RefreshRate" type="double" value="59.998611"/> - <property name="Rotation" type="int" value="0"/> - <property name="Reflection" type="string" value="0"/> - <property name="Primary" type="bool" value="true"/> - <property name="Scale" type="empty"> - <property name="X" type="double" value="1.000000"/> - <property name="Y" type="double" value="1.000000"/> - </property> - <property name="Position" type="empty"> - <property name="X" type="int" value="0"/> - <property name="Y" type="int" value="0"/> - </property> - </property> - </property> -</channel> diff --git a/files/xfce/settings/xfce4-desktop.xml b/files/xfce/settings/xfce4-desktop.xml @@ -7,22 +7,22 @@ <property name="workspace0" type="empty"> <property name="color-style" type="int" value="0"/> <property name="image-style" type="int" value="4"/> - <property name="last-image" type="string" value="/etc/nixos/files/images/wallpapers/Sunset.jpg"/> + <property name="last-image" type="string" value="@system/files/images/wallpapers/Sunset.jpg"/> </property> <property name="workspace1" type="empty"> <property name="color-style" type="int" value="0"/> <property name="image-style" type="int" value="5"/> - <property name="last-image" type="string" value="/nix/store/8ww4s5mj1p6l5jmb1jqdmrr4cv0mrmwq-xfdesktop-4.16.0/share/backgrounds/xfce/xfce-verticals.png"/> + <property name="last-image" type="string" value="@desktop/share/backgrounds/xfce/xfce-verticals.png"/> </property> <property name="workspace2" type="empty"> <property name="color-style" type="int" value="0"/> <property name="image-style" type="int" value="5"/> - <property name="last-image" type="string" value="/nix/store/8ww4s5mj1p6l5jmb1jqdmrr4cv0mrmwq-xfdesktop-4.16.0/share/backgrounds/xfce/xfce-verticals.png"/> + <property name="last-image" type="string" value="@desktop/share/backgrounds/xfce/xfce-verticals.png"/> </property> <property name="workspace3" type="empty"> <property name="color-style" type="int" value="0"/> <property name="image-style" type="int" value="5"/> - <property name="last-image" type="string" value="/nix/store/8ww4s5mj1p6l5jmb1jqdmrr4cv0mrmwq-xfdesktop-4.16.0/share/backgrounds/xfce/xfce-verticals.png"/> + <property name="last-image" type="string" value="@desktop/share/backgrounds/xfce/xfce-verticals.png"/> </property> </property> </property> diff --git a/files/xfce/settings/xfce4-panel.xml b/files/xfce/settings/xfce4-panel.xml @@ -123,19 +123,11 @@ <property name="style" type="uint" value="0"/> </property> <property name="plugin-2" type="string" value="xfce4-clipman-plugin"/> - <property name="plugin-16" type="string" value="namebar"/> <property name="plugin-17" type="string" value="xfce4-notes-plugin"/> <property name="plugin-18" type="string" value="eyes"/> <property name="plugin-19" type="string" value="screenshooter"/> <property name="plugin-20" type="string" value="weather"> - <property name="location" type="empty"> - <property name="name" type="string" value="Hyderabad, India"/> - <property name="latitude" type="string" value="17.425400"/> - <property name="longitude" type="string" value="78.507500"/> - </property> <property name="msl" type="int" value="529"/> - <property name="timezone" type="string" value="Asia/Kolkata"/> - <property name="offset" type="string" value="+05:30"/> <property name="cache-max-age" type="int" value="172800"/> <property name="power-saving" type="bool" value="true"/> <property name="units" type="empty"> @@ -153,7 +145,7 @@ <property name="layout" type="int" value="1"/> <property name="days" type="int" value="5"/> </property> - <property name="theme-dir" type="string" value="/nix/store/qrb3nm6l6mz283ifjchn2idw2d7l8mi5-xfce4-weather-plugin-0.11.0/share/xfce4/weather/icons/liquid"/> + <property name="theme-dir" type="string" value="/run/current-system/sw/share/xfce4/weather/icons/liquid"/> <property name="scrollbox" type="empty"> <property name="show" type="bool" value="true"/> <property name="animate" type="bool" value="true"/> diff --git a/flake.lock b/flake.lock @@ -3,11 +3,11 @@ "compatibility": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1659725433, - "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=", + "lastModified": 1674127017, + "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", "owner": "serokell", "repo": "deploy-rs", - "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb", + "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "filter": { "locked": { - "lastModified": 1661201956, - "narHash": "sha256-RizGJH/buaw9A2+fiBf9WnXYw4LZABB5kMAZIEE5/T8=", + "lastModified": 1666547822, + "narHash": "sha256-razwnAybPHyoAyhkKCwXdxihIqJi1G6e1XP4FQOJTEs=", "owner": "numtide", "repo": "nix-filter", - "rev": "3b821578685d661a10b563cba30b1861eec05748", + "rev": "1a3b735e13e90a8d2fd5629f2f8363bd7ffbbec7", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1665770290, - "narHash": "sha256-sVG7WBlHipev+B1Nj+j+D+OqhUwYIpJrEvBxi5Yd41w=", + "lastModified": 1674646471, + "narHash": "sha256-MRKHX3woN7yJ0A5zj1ZyJNQJ30TDggDusrqJGvFLxxA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "fb7e1ebe0eb44628c353e1d13923f602c8d8f784", + "rev": "e57cc786848fa1d1af001ffd9387aac04c3577b0", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1660727616, - "narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=", + "lastModified": 1672682641, + "narHash": "sha256-940TLvtdT8YKuP5nXcPhUfNeK0A/leSjjG8hfqvWM84=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "adccd191a0e83039d537e021f19495b7bad546a1", + "rev": "30516cb2b01896e14ce66893e414b6e3eec71cac", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "hardware": { "locked": { - "lastModified": 1665839131, - "narHash": "sha256-0KYo13PfwvPw5i/SC+hGy3hsgR++Co7SIzv+0e9YOnM=", + "lastModified": 1674550793, + "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "674d05f9ae2249d606a0e6fc63e522d2031a27ac", + "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "type": "github" }, "original": { @@ -135,39 +135,52 @@ "inputs": { "nixpkgs": [ "stable" + ], + "utils": [ + "utils", + "flake-utils" ] }, "locked": { - "lastModified": 1665475263, - "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=", + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "17208be516fc36e2ab0ceb064d931e90eb88b2a3", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } }, "hooks": { "inputs": { + "flake-compat": [ + "compatibility" + ], "flake-utils": [ "utils", "flake-utils" ], + "gitignore": [ + "ignore" + ], "nixpkgs": [ "stable" + ], + "nixpkgs-stable": [ + "stable" ] }, "locked": { - "lastModified": 1665584211, - "narHash": "sha256-Qc9zn43UjLpP823BP416hAsoaXugwWw+nKPVqsNhqdY=", + "lastModified": 1674550893, + "narHash": "sha256-HXI8AB96PP7UZ7iPANACXM8qc9eMz0ljxBEDM8JJKhY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "94b0f300dd9a23d4e851aa2a947a1511d3410e2d", + "rev": "7bdf85f6bbef581eb687838d19f2b35a4c9d77f0", "type": "github" }, "original": { @@ -198,11 +211,11 @@ }, "impermanence": { "locked": { - "lastModified": 1661933071, - "narHash": "sha256-RFgfzldpbCvS+H2qwH+EvNejvqs+NhPVD5j1I7HQQPY=", + "lastModified": 1668668915, + "narHash": "sha256-QjY4ZZbs9shwO4LaLpvlU2bO9J1juYhO9NtV3nrbnYQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "def994adbdfc28974e87b0e4c949e776207d5557", + "rev": "5df9108b346f8a42021bf99e50de89c9caa251c3", "type": "github" }, "original": { @@ -213,44 +226,44 @@ }, "library": { "locked": { - "lastModified": 1653785473, - "narHash": "sha256-kqSk70xGTRfmJi2XPfpxF4ckfrlB0bf9vmN1V3aydTA=", + "lastModified": 1674348806, + "narHash": "sha256-hKi7sFobRQg6sJxskRFCjt/d8gR+w0ClEWZatlr2rnw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06", + "rev": "af5239f892ae6e1c8bb560b11ed874cebbd10696", "type": "github" }, "original": { "owner": "nix-community", "ref": "master", "repo": "nixpkgs.lib", - "rev": "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06", + "rev": "af5239f892ae6e1c8bb560b11ed874cebbd10696", "type": "github" } }, - "nixpkgs-22_05": { + "nixpkgs-stable": { "locked": { - "lastModified": 1665870850, - "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", + "lastModified": 1674352297, + "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", + "rev": "918b760070bb8f48cb511300fcd7e02e13058a2e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1665916685, - "narHash": "sha256-M/SNFT5FlLwbfWLBQWtjgtk8CMFAb4ZD6EWshge5QPU=", + "lastModified": 1674651781, + "narHash": "sha256-EXq3gfw6uJLlyaSkv1GiFuJx5fVkBFKeAe2UBqTZ7wA=", "owner": "nix-community", "repo": "NUR", - "rev": "29e55c0df8ae7fa986d12a2c96e38c0788ef2093", + "rev": "30a00b5df32dfa34f069e83bc92283bd614cd021", "type": "github" }, "original": { @@ -287,14 +300,14 @@ "nixpkgs": [ "stable" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1665897743, - "narHash": "sha256-B0+jYpGOd/ngA6ECAV91+Y61KfCE/Iy8GDWV44PHNzA=", + "lastModified": 1674546403, + "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d662d681a82cd586c8c12e34d36c2c2b73338e6", + "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c", "type": "github" }, "original": { @@ -305,27 +318,27 @@ }, "stable": { "locked": { - "lastModified": 1665856284, - "narHash": "sha256-FQusb2DuFo8UF0jhUSPFhDKc40jRbHcdyyw4anN20WA=", + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be44bf672c61a284f759898d1e59077b00655c4c", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "unstable": { "locked": { - "lastModified": 1665848363, - "narHash": "sha256-3Jow1YxzPtQnck1bAAvbVxgRH4gNnkIdw871Vm6UtAU=", + "lastModified": 1674459583, + "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83b198a2083774844962c854f811538323f9f7b1", + "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "type": "github" }, "original": { @@ -374,7 +387,7 @@ "locked": { "lastModified": 1639769632, "narHash": "sha256-s1Tfm1x9EUNdd2HdtPnI+4zr6XTGtkspuFn50kqYdhM=", - "ref": "refs/heads/master", + "ref": "master", "rev": "9d07da799c23a221b0a6462a5db404007ac18250", "revCount": 37, "type": "git", @@ -395,11 +408,11 @@ ] }, "locked": { - "lastModified": 1665926272, - "narHash": "sha256-FUMyqZ+aD182iek27snX0qnno+c36m6fNnjMPq51p3g=", + "lastModified": 1674571283, + "narHash": "sha256-gASnVPW5GRkRQMMHxPCriGwFr9kgr2as7w2AObw8aM0=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "aeb42268dee974d620851148aac75a9f9fb88348", + "rev": "4588039e8fe87f2a28872bf171c052bbd061e708", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix @@ -23,7 +23,7 @@ # Author -> V 7 <maydayv7@gmail.com> # # License -> MIT # # URL -> github:maydayv7/dotfiles # -# Version -> 22.11 (v11) # +# Version -> 23.xy (v12) # # --------------------------------------- # # Welcome to Ground Zero! # # The Very Heart of my 'dotfiles' # @@ -63,7 +63,7 @@ inputs = { ## Package Repositories ## # NixOS Stable Release - stable.url = "github:NixOS/nixpkgs?ref=nixos-22.05"; + stable.url = "github:NixOS/nixpkgs?ref=nixos-22.11"; # Unstable Packages Repository unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; @@ -84,7 +84,7 @@ owner = "nix-community"; repo = "nixpkgs.lib"; ref = "master"; - rev = "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06"; + rev = "af5239f892ae6e1c8bb560b11ed874cebbd10696"; }; # Flake Compatibility Library @@ -108,8 +108,9 @@ # User Home Manager home = { - url = "github:nix-community/home-manager?ref=release-22.05"; + url = "github:nix-community/home-manager?ref=release-22.11"; inputs.nixpkgs.follows = "stable"; + inputs.utils.follows = "utils/flake-utils"; }; # Authentication Credentials Manager @@ -132,7 +133,10 @@ hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "stable"; + inputs.nixpkgs-stable.follows = "stable"; + inputs.flake-compat.follows = "compatibility"; inputs.flake-utils.follows = "utils/flake-utils"; + inputs.gitignore.follows = "ignore"; }; # Automatic Deployment Tool diff --git a/modules/base/firmware.nix b/modules/base/firmware.nix @@ -118,6 +118,7 @@ with {inherit (lib) mkAfter mkForce;}; { cpuFreqGovernor = "powersave"; }; + systemd.oomd.enable = false; services.earlyoom = { enable = true; enableNotifications = true; diff --git a/modules/default.nix b/modules/default.nix @@ -113,7 +113,7 @@ in { # Localization time.timeZone = timezone; - i18n.defaultLocale = locale; + i18n.defaultLocale = "en_${locale}"; # Kernel Configuration boot = { @@ -130,7 +130,7 @@ in { # Package Configuration nixpkgs = {inherit pkgs;}; nix = { - maxJobs = hardware.cores or 4; + settings.max-jobs = hardware.cores or 4; index = mkIf (update == "") true; nixPath = ["nixpkgs=${input}"]; registry.nixpkgs.flake = mkForce input; diff --git a/modules/gui/gnome.nix b/modules/gui/gnome.nix @@ -50,8 +50,8 @@ in { touchegg.enable = true; telepathy.enable = true; gnome = { - chrome-gnome-shell.enable = true; core-developer-tools.enable = true; + gnome-browser-connector.enable = true; gnome-initial-setup.enable = true; gnome-keyring.enable = true; gnome-remote-desktop.enable = true; @@ -96,15 +96,15 @@ in { programs.vscode = mkIf (elem pkgs.vscode apps) { userSettings = { "workbench.colorTheme" = "GNOME dark"; - "terminal.external.linuxExec" = "gnome-terminal"; + "terminal.external.linuxExec" = "gnome-console"; }; extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "vscode-gnome-theme"; publisher = "rafaelmardojai"; - version = "0.3.0"; - sha256 = "sha256-CXBh175GjiGbqkm/72SLDTOZZjF62cHZUTVVFiQkcVU="; + version = "0.4.1"; + sha256 = "sha256-J4WEa6VVPks6rhzjE5oD88RwqaRjTjn/gPeZKaCS6RM="; } ]; }; @@ -157,7 +157,6 @@ in { gnome-dictionary gnome-notes gnome-sound-recorder - gnome-terminal gnome-tweaks polari @@ -191,13 +190,10 @@ in { ++ (with pkgs; with unstable.gnomeExtensions // gnomeExtensions; [ # GNOME Shell Extensions - add-username-to-top-panel alphabetical-app-grid appindicator avatar - burn-my-windows caffeine - clipboard-history color-picker compiz-windows-effect compiz-alike-magic-lamp-effect @@ -209,10 +205,9 @@ in { just-perfection lock-keys lock-screen-message - screenshot-locations - sound-output-device-chooser + unstable.gnomeExtensions.pano timepp - top-bar-organizer + custom.top-bar-organizer vitals worksapce-dry-names x11-gestures @@ -227,6 +222,7 @@ in { ".config/gnome-builder" ".config/GIMP" ".config/pitivi" + ".local/share/clipboard" ".local/share/epiphany" ".local/share/evolution" ".local/share/flatpak" @@ -238,7 +234,6 @@ in { ".local/share/polari" ".local/share/telepathy" ".local/share/webkitgtk" - ".cache/clipboard-indicator@tudmotu.com" ".cache/fractal" ".cache/gnome-builder" ".cache/timepp_gnome_shell_extension" diff --git a/modules/gui/xfce.nix b/modules/gui/xfce.nix @@ -6,8 +6,8 @@ ... }: with files; let - inherit (lib) mkIf mkForce mkMerge util; inherit (config.gui) desktop; + inherit (lib) mapAttrs' mkIf mkForce mkMerge nameValuePair util; # GTK+ Theme theme = { @@ -69,7 +69,7 @@ in { // theme; # Default Applications - xdg.mimeApps.defaultApplications = util.xdg.mime (import files.xdg.mime) { + xdg.mimeApps.defaultApplications = util.build.mime xdg.mime { audio = ["org.xfce.Parole.desktop"]; calendar = ["org.xfce.orage.desktop"]; directory = ["thunar.desktop"]; @@ -79,23 +79,24 @@ in { video = ["org.xfce.Parole.desktop"]; }; - home.file = { - # GTK+ Bookmarks - ".config/gtk-3.0/bookmarks".text = gtk.bookmarks; + home.file = + { + # GTK+ Bookmarks + ".config/gtk-3.0/bookmarks".text = gtk.bookmarks; - # Desktop Settings - ".config/xfce4/terminal/terminalrc".text = xfce.terminal; - ".config/xfce4/xfconf/xfce-perchannel-xml".source = xfce.settings; + # Plank Dock + ".config/autostart/Dock.desktop".text = plank.autostart; + ".config/plank/dock1/launchers".source = plank.launchers; + ".local/share/plank/themes/default/dock.theme".text = plank.theme; - # Plank Dock - ".config/autostart/Dock.desktop".text = plank.autostart; - ".config/plank/dock1/launchers".source = plank.launchers; - ".local/share/plank/themes/default/dock.theme".text = plank.theme; - }; + # Desktop Settings + ".config/xfce4/terminal/terminalrc".text = xfce.terminal; + } + // mapAttrs' (name: value: nameValuePair ".config/xfce4/xfconf/xfce-perchannel-xml/${name}.xml" {"text" = value;}) files.xfce.settings; }; # Plugins - services.xserver.desktopManager.xfce.thunarPlugins = with pkgs.xfce; [ + programs.thunar.plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-dropbox-plugin thunar-volman @@ -109,7 +110,6 @@ in { mate.atril xfce4-clipman-plugin xfce4-eyes-plugin - xfce4-namebar-plugin xfce4-notes-plugin xfce4-panel-profiles xfce4-pulseaudio-plugin diff --git a/modules/gui/xorg.nix b/modules/gui/xorg.nix @@ -8,7 +8,6 @@ layout = "us"; # Driver Settings - useGlamor = true; videoDrivers = ["modesetting"]; }; }; diff --git a/modules/hardware/virtualisation.nix b/modules/hardware/virtualisation.nix @@ -48,7 +48,7 @@ in { swtpm.enable = true; ovmf = { enable = true; - package = pkgs.OVMFFull; + packages = [pkgs.OVMFFull]; }; }; }; diff --git a/modules/nix/checks.nix b/modules/nix/checks.nix @@ -11,37 +11,13 @@ with {inherit (lib) deploy filters hooks util;}; # Pre-Commit Hooks commit = hooks."${system}".run { src = filters.gitignoreSource ../../.; + settings.statix.ignore = ["flake.nix" "_*"]; hooks = { alejandra.enable = true; prettier.enable = true; - nixfmt.enable = false; - nix-linter.enable = false; shellcheck.enable = true; statix.enable = true; stylua.enable = true; }; - - settings = { - statix.ignore = ["flake.nix" "_*"]; - nix-linter.checks = [ - "BetaReduction" - "DIYInherit" - "EmptyInherit" - "EmptyLet" - "EmptyVariadicParamSet" - "EtaReduce" - "FreeLetInFunc" - "LetInInheritRecset" - "ListLiteralConcat" - "NegateAtom" - "SequentialLet" - "SetLiteralUpdate" - "UnfortunateArgName" - "UnneededRec" - "UnusedArg" - "UnusedLetBind" - "UpdateEmptySet" - ]; - }; }; } diff --git a/modules/nix/default.nix b/modules/nix/default.nix @@ -19,25 +19,25 @@ with {inherit (lib.util.map) array;}; { package = pkgs.nix; # Garbage Collection - autoOptimiseStore = true; + settings.auto-optimise-store = true; gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 7d"; }; - # User Permissions - allowedUsers = ["root" "@wheel"]; - trustedUsers = ["root" "@wheel"]; - # Registry linkInputs = true; generateNixPathFromInputs = true; generateRegistryFromInputs = true; + # User Permissions + settings.allowed-users = ["root" "@wheel"]; + settings.trusted-users = ["root" "@wheel"]; + # Additional Features - useSandbox = true; - systemFeatures = ["kvm" "recursive-nix"]; + settings.sandbox = true; + settings.system-features = ["kvm" "recursive-nix"]; extraOptions = '' accept-flake-config = true warn-dirty = false diff --git a/modules/nix/format.nix b/modules/nix/format.nix @@ -1,7 +1,6 @@ [ "alejandra" "manix" - "nix-linter" "prettier" "shellcheck" "statix" diff --git a/modules/shell/bash.nix b/modules/shell/bash.nix @@ -42,7 +42,6 @@ in { # Initialization initExtra = '' - source <(${pkgs.cod}/bin/cod init $$ bash) eval $(${pkgs.thefuck}/bin/thefuck --alias "fix") '' # Prompt diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix @@ -41,27 +41,23 @@ in { eval $(${pkgs.thefuck}/bin/thefuck --alias "fix") ''; - initExtra = - '' - source <(${pkgs.cod}/bin/cod init $$ zsh) - '' - # Keybindings - + '' - bindkey '^[[1;5C' forward-word - bindkey '^[[1;5D' backward-word - bindkey '^[[3;5~' kill-word - bindkey '^[[3~' delete-char - bindkey "^[[5~" beginning-of-history - bindkey "^[[6~" end-of-history - bindkey '^[[A' up-line-or-search - bindkey '^[[B' down-line-or-search - bindkey '^[[C' forward-char - bindkey '^[[D' backward-char - bindkey '^[[F' end-of-line - bindkey '^H' backward-kill-word - bindkey '^[[H' beginning-of-line - bindkey '^J' backward-kill-line - ''; + # Keybindings + initExtra = '' + bindkey '^[[1;5C' forward-word + bindkey '^[[1;5D' backward-word + bindkey '^[[3;5~' kill-word + bindkey '^[[3~' delete-char + bindkey "^[[5~" beginning-of-history + bindkey "^[[6~" end-of-history + bindkey '^[[A' up-line-or-search + bindkey '^[[B' down-line-or-search + bindkey '^[[C' forward-char + bindkey '^[[D' backward-char + bindkey '^[[F' end-of-line + bindkey '^H' backward-kill-word + bindkey '^[[H' beginning-of-line + bindkey '^J' backward-kill-line + ''; # Command History history = { diff --git a/modules/user/passwords/v7.secret b/modules/user/passwords/v7.secret @@ -1,13 +1,13 @@ { - "data": "ENC[AES256_GCM,data:4bk8A+snsapESi0eT5jm0DTer3qgvrXDsPLVWCwYeWGcVYK+xOQP+FY/2MpYE5mJV1dp7O+22wL/0K9YZhoq1AoJOdP/EkzlisLEYeGBYv+EH3PfA/LtOzNyneOTS6/crdCy2YsSOiY=,iv:3zVT2S3AWDrpZ5CTUvCUOxwOqLU1LSxl7sewjxYwuN8=,tag:BwDg/d/s9WmuSiUPuh59qQ==,type:str]", + "data": "ENC[AES256_GCM,data:zE0VdZHmSD/LdSU9lzDP0X2+XhS3fvF+3tWAysKmay2kbFHoH3XlgdkxQVJ3YZLWubnbblsii09c2sc2F2qNcQF+3atrIHAerg==,iv:WI08Zgjp4m305IPswCmiUNBIWqF2NzGMX1WRt9LFkDI=,tag:+6xlVAKpzZhQGCnht5v7SA==,type:str]", "sops": { "kms": null, "gcp_kms": null, "azure_kv": null, "hc_vault": null, "age": null, - "lastmodified": "2021-12-01T08:29:33Z", - "mac": "ENC[AES256_GCM,data:lDx2MGYBXuu9gHiYjnTdyDD05a92SnTHAF/Lpx60Lqun7pGWujgBH0iG2edd8OLP0OYbGvSt1UB6JF6ZdmOor0s8U84rpbttBtnOKLD/OvzybbaO3CgIVAshTe3r3uiNxvPTpIwsXXhM95vHCIyzLPW36L6spqTVve1xlnCKQvo=,iv:lrQkExQ9PQGhbmvsYE2B0pp7yxH3WPWbdRfZX2BeWu8=,tag:huWkQelO9r+WPnRYXNiySw==,type:str]", + "lastmodified": "2023-01-26T01:03:55Z", + "mac": "ENC[AES256_GCM,data:AaAUnd1RyFbfXWc4ss/2hH++G1lrvvbeAA3PnEmTax7mI+b0d5ucfXlwWljDzLl82+tRllAdDzQcSvwNf23RUIvawwcvn0SPS2zekvDVbfWxZNGBWei9EJtE8FQVLtqxApBFOxfmN4sBxcFjDPMH6JUtJt1ElGgrSXWQ0xhITew=,iv:AoaJ8c0cifM9AAd7jzyljP0gbKkWB2CG/liZuCi2iqY=,tag:jcWFBaG6rmK4X1J1kvdmmA==,type:str]", "pgp": [ { "created_at": "2022-02-05T06:50:31Z", @@ -21,6 +21,6 @@ } ], "unencrypted_suffix": "_unencrypted", - "version": "3.7.1" + "version": "3.7.3" } } \ No newline at end of file diff --git a/packages/adw-gtk3.nix b/packages/adw-gtk3.nix @@ -6,13 +6,13 @@ with pkgs; stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "v2.0"; + version = "v4.2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = version; - sha256 = "sha256-gFyNbgOzX+WVo0MP+VQvxVTnLV7Bhgo1fUnjuAku/Sc="; + sha256 = "sha256-dHSYm52+Wra5rh756sOuAlaKoQtkT8bSNGVnbINy8jA="; }; nativeBuildInputs = [ diff --git a/packages/dotfiles.nix b/packages/dotfiles.nix @@ -6,8 +6,8 @@ }: pkgs.stdenv.mkDerivation rec { pname = "Dotfiles"; - version = "v11"; - longVersion = "22.11"; + version = "v12"; + longVersion = "23.xy"; src = files.path.toplevel; dontBuild = true; diff --git a/packages/firefox-gnome-theme/metadata.nix b/packages/firefox-gnome-theme/metadata.nix @@ -1,6 +1,6 @@ { repo = "https://github.com/rafaelmardojai/firefox-gnome-theme"; branch = "master"; - rev = "180eee1f564ae7ac63c4f3f735a07e473eb87992"; - sha256 = "sha256-IxEzw8RzG0UswN+gOTlufaiLhouHQOtBMvIRqB8X+CM="; + rev = "5236cb7be0a55aa2c20df91586f309b20fa26e3d"; + sha256 = "sha256-SVi/K4hwKO0zK0N5mWiETwBO3NWGShk7Y333gnM7/Mw="; } diff --git a/packages/fly-pie.nix b/packages/fly-pie.nix @@ -6,12 +6,12 @@ with pkgs; stdenv.mkDerivation rec { pname = "gnome-shell-extension-fly-pie"; - version = "v16"; + version = "v17"; src = fetchzip { stripRoot = false; url = "https://extensions.gnome.org/extension-data/flypieschneegans.github.com.${version}.shell-extension.zip"; - sha256 = "sha256-YmPEeHNauWGnd9lIs9ymq3wL3Cu2FgRMgueyXzKTXC0="; + sha256 = "sha256-ly6SuDOJL90DcMhGBHcOcAI2ezY9FOtk1bqlyRTJ24w="; }; dontBuild = true; diff --git a/packages/overlays/discord.nix b/packages/overlays/discord.nix @@ -1,11 +1,11 @@ final: prev: { # Update Discord to Latest Version discord = prev.discord.overrideAttrs (_: rec { - version = "0.0.21"; + version = "0.0.24"; src = prev.fetchzip { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-f39g9rnvvOuquPSGdJkqSoc12VGHzaVjF8Z6kATBid8="; + sha256 = "sha256-qPK+A3zvmoemWF+FL0VJSZO+s/zbkgZvUs4zNMpH9yA="; }; }); } diff --git a/packages/overlays/gnome-terminal.nix b/packages/overlays/gnome-terminal.nix @@ -1,21 +0,0 @@ -final: prev: { - # GNOME Terminal Transparency Patch - # https://aur.archlinux.org/packages/gnome-terminal-transparency - gnome = - prev.gnome - // { - gnome-terminal = - final.lib.overrideDerivation prev.gnome.gnome-terminal - (drv: { - patches = - drv.patches - ++ [ - (prev.fetchpatch { - name = "transparency.patch"; - sha256 = "sha256-vQ/xHgbfp03zp4b/llfP2MRgC15NR3XGkRm26hfN8Ow="; - url = "https://aur.archlinux.org/cgit/aur.git/plain/transparency.patch?h=gnome-terminal-transparency&id=eb672d7753287b88c5fe2557566fd4611c8c0a38"; - }) - ]; - }); - }; -} diff --git a/packages/overlays/mutter-rounded.nix b/packages/overlays/mutter-rounded.nix @@ -1,43 +0,0 @@ -final: prev: { - # GNOME Mutter Rounded Corners Patch - # https://aur.archlinux.org/packages/mutter-rounded - gnome = - prev.gnome - // { - mutter = - final.lib.overrideDerivation prev.gnome.mutter - (drv: let - commit = "7a7fd26eea94962ea9af13443abfdc3f5cfe6b37"; - in rec { - assets = prev.fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/snapshot/aur-${commit}.tar.gz"; - sha256 = "sha256-FaLKrNcIHZFW1EU4lWzyHMU+i3Ci6trAFV37WTaBObQ="; - }; - - postUnpack = '' - tar xzf ${assets} - find ./aur-${commit} -iregex ".*\.[ch].*" -exec cp {} $sourceRoot/src/ \; - ''; - - patches = - drv.patches - ++ [ - (prev.fetchpatch { - name = "mr1441.patch"; - sha256 = "sha256-1mAphPV1W0vDr9ga6QTYgd82ObiiFIqzzm2Q7sNEgmc="; - url = "https://aur.archlinux.org/cgit/aur.git/plain/mr1441.patch?h=mutter-rounded&id=${commit}"; - }) - (prev.fetchpatch { - name = "rounded_corners.patch"; - sha256 = "sha256-rY2P1UJil0oP1lz0qcYJL2HSPJrMgFJzHw+QUsHhB8U="; - url = "https://aur.archlinux.org/cgit/aur.git/plain/rounded_corners.patch?h=mutter-rounded&id=${commit}"; - }) - (prev.fetchpatch { - name = "shell_blur_effect.patch"; - sha256 = "sha256-ZR4Lh6XyBhF35SIz1537pvrjtXQuNkY6nffKqPOQ2eI="; - url = "https://aur.archlinux.org/cgit/aur.git/plain/shell_blur_effect.patch?h=mutter-rounded&id=${commit}"; - }) - ]; - }); - }; -} diff --git a/packages/top-bar-organizer.nix b/packages/top-bar-organizer.nix @@ -0,0 +1,40 @@ +{ + lib, + pkgs, + ... +}: +with pkgs; + stdenv.mkDerivation rec { + pname = "gnome-shell-extension-top-bar-organizer"; + version = "v2"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "julianschacher"; + repo = "top-bar-organizer"; + rev = version; + sha256 = "sha256-qpvjVT5/+3tw1IUHfK3njtS8AVI6Xy/am8zQ5o2H4uo="; + }; + + dontBuild = true; + buildInputs = [glib]; + installPhase = '' + glib-compile-schemas src/schemas + mkdir -p $out/share/gnome-shell/extensions/top-bar-organizer@julian.gse.jsts.xyz/ + cp -r src/. $out/share/gnome-shell/extensions/top-bar-organizer@julian.gse.jsts.xyz/ + ''; + + passthru = { + extensionUuid = "top-bar-organizer@julian.gse.jsts.xyz"; + extensionPortalSlug = "top-bar-organizer"; + }; + + meta = with lib; { + description = "Gnome Shell Extension for organizing your Top Bar"; + longDescription = "Manually Packaged because v3 doesn't work"; + homepage = "https://extensions.gnome.org/extension/4356/top-bar-organizer/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = ["maydayv7"]; + }; + } diff --git a/scripts/nixos.nix b/scripts/nixos.nix @@ -164,9 +164,6 @@ in check) echo "Formatting Code..." pushd ${path.system} > /dev/null; nix fmt; popd > /dev/null - echo "Checking Syntax..." - nix-linter -r ${path.system} || true - newline case $2 in "") nix flake check ${path.system} --keep-going;; "--trace") nix flake check ${path.system} --keep-going --show-trace;; diff --git a/site/content/anime.md b/site/content/anime.md @@ -26,11 +26,12 @@ comments = true - Domestic Girlfriend - Erased - Fruits Basket <sup>#</sup> +- Fuufu Ijou, Koibito Miman <sup>\*</sup> - Gekkan Shoujo Nozaki-kun - Golden Time - Horimiya - I Can't Understand What My Husband Is Saying -- Ijinaraide, Nagatoro-san <sup>\*</sup> +- Ijinaraide, Nagatoro-san <sup>\*</sup> <sup>#</sup> - Kaguya-sama: Love is War <sup>#</sup> - Kakkou no Iinazuke - Kawaii dake ja nai Shikimori-san @@ -40,6 +41,7 @@ comments = true - Kokoro Connect - Komi Can't Communicate <sup>\*</sup> <sup>#</sup> - Konosuba <sup>#</sup> +- Link Click <sup>\*</sup> - Lycoris Recoil <sup>\*</sup> - My Dress Up Darling <sup>\*</sup> - My Senpai is Annoying @@ -53,6 +55,7 @@ comments = true - Scums Wish <sup>\*</sup> - Spy X Family <sup>\*</sup> <sup>#</sup> - Steins;Gate <sup>#</sup> +- Sword Art Online <sup>#</sup> - The Pet Girl of Sakurasou <sup>\*</sup> - The Quintessential Quintuplets <sup>#</sup> - Tomodachi Game <sup>\*</sup> @@ -60,9 +63,9 @@ comments = true - ToraDora! - Tsurezure Children - Uzaki-chan wa Asobitai! <sup>\*</sup> <sup>#</sup> -- Violet Evergarden -- Vermeil in Gold -- When will Ayumu make his Move +- Violet Evergarden <sup>#</sup> +- Vermeil in Gold <sup>\*</sup> +- When will Ayumu make his Move <sup>\*</sup> - Wotaku ni Koi wa Muzukashii - Yosuga no Sora - Your Lie in April @@ -83,7 +86,6 @@ comments = true # Ongoing - [x] Chainsaw Man -- [ ] Fuufu Ijou, Koibito Miman # Wishlist