dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 2b997c4bf99ace2de97bfc49a4234052735066ea parent 73fb4b76a50f05abe674c920d3b6e591ba9a79ce Author: V7 <maydayv7@gmail.com> Date: Sun, 5 Jun 2022 14:50:58 +0530 feat!: Upgrade to NixOS v22.05 (Quokka) Changes: + Deprecate `nixFlakes` overlay + Pass `config` attribute to `home-manager` + Refine GNOME Desktop Configuration - Package `adw-gtk3` Theme - Fix Dconf Keys - Update `firefox-gnome-theme` - Patch GNOME Mutter - Fix GNOME Extensions + Fix persisted system directory Flake lock file updates: • Updated input 'deploy': 'github:serokell/deploy-rs/83e0c78291cd08cb827ba0d553ad9158ae5a95c3' (2022-03-28) → 'github:serokell/deploy-rs/184349d8149436748986d1bdba087e4149e9c160' (2022-05-26) • Updated input 'filter': 'github:numtide/nix-filter/40a58baa248a8b335e2d66ca258a74248af9d834' (2022-04-13) → 'github:numtide/nix-filter/3e81a637cdf9f6e9b39aeb4d6e6394d1ad158e16' (2022-05-26) • Updated input 'gaming': 'github:fufexan/nix-gaming/f590aa8f7a7a7a312f01cbc5a802609fbe766d5c' (2022-04-30) → 'github:fufexan/nix-gaming/0b4e36ef5347ef4fefd469279490851b2bfa5116' (2022-06-01) • Updated input 'generators': 'github:nix-community/nixos-generators/3cdf22c79bc80910e2b610cd59fcb8408354ddbc' (2022-04-26) → 'github:nix-community/nixos-generators/fb3ee0f618b8c80dea1239691b15dfeb4bb46331' (2022-05-23) • Updated input 'hardware': 'github:nixos/nixos-hardware/6b4ebea9093c997c5f275c820e679108de4871ab' (2022-04-21) → 'github:nixos/nixos-hardware/0cab18a48de7914ef8cad35dca0bb36868f3e1af' (2022-06-01) • Updated input 'home': 'github:nix-community/home-manager/d14adb99f3fb562ec74ad18c032efc154b438034' (2022-04-26) → 'github:nix-community/home-manager/ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675' (2022-06-01) • Updated input 'hooks': 'github:cachix/pre-commit-hooks.nix/e5e7b3b542e7f4f96967966a943d7e1c07558042' (2022-04-04) → 'github:cachix/pre-commit-hooks.nix/521a524771a8e93caddaa0ac1d67d03766a8b0b3' (2022-05-16) • Updated input 'hooks/nixpkgs': follows 'unstable' → follows 'stable' • Updated input 'library': 'github:nix-community/nixpkgs.lib/1637168cfad105ccd522ae59648ce0289966c565' (2022-02-20) → 'github:nix-community/nixpkgs.lib/81ce0b50f52b58a6a97184c0a4c42e6d964cfa06' (2022-05-29) • Updated input 'nur': 'github:nix-community/NUR/8fb1c0c3e4f92251c29ead8d61b0321a351615ec' (2022-04-30) → 'github:nix-community/NUR/86ff2d098bce1d623232f4886027a1d61317b195' (2022-06-04) • Updated input 'sops': 'github:Mic92/sops-nix/c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8' (2022-04-12) → 'github:Mic92/sops-nix/36b5901782e7fbfc191cace910f67f8b8743f678' (2022-05-29) • Added input 'sops/nixpkgs-21_11': 'github:NixOS/nixpkgs/baa82d4b626288c7439eeea073a18aabbe435991' (2022-05-29) • Added input 'sops/nixpkgs-22_05': 'github:NixOS/nixpkgs/db78278ff296cf21eca7e8c08ee99707387a54fa' (2022-05-29) • Updated input 'stable': 'github:NixOS/nixpkgs/feea25c58657fa81d16e0e51f80e1a02ef4cbd49' (2022-04-27) → 'github:NixOS/nixpkgs/7a20c208aacf4964c19186dcad51f89165dc7ed0' (2022-06-03) • Updated input 'unstable': 'github:NixOS/nixpkgs/e10da1c7f542515b609f8dfbcf788f3d85b14936' (2022-04-26) → 'github:NixOS/nixpkgs/236cc2971ac72acd90f0ae3a797f9f83098b17ec' (2022-06-03) • Updated input 'utils': 'github:gytis-ivaskevicius/flake-utils-plus/06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46' (2022-03-14) → 'github:gytis-ivaskevicius/flake-utils-plus/f8d6d1f87b6177e3bc674c29f247bdbf897ba274' (2022-05-16) • Updated input 'wine': 'github:emmanuelrosa/erosanix/8d4eeb8127afa2a8a19cb67231d9cde0209f6c9b' (2022-04-30) → 'github:emmanuelrosa/erosanix/54ac29dfe5d8d34f28321b34d0ef635f88048709' (2022-06-03)
Diffstat:
29 files changed, 264 insertions(+), 199 deletions(-)
diff --git a/.version b/.version @@ -1 +1 @@ -21.11 -\ No newline at end of file +22.05 +\ 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 @@ -411,8 +411,11 @@ You can navigate to the `README`'s present in the various directories to know mo <details> <summary><b>Changelog</b></summary> -### NEXT +### 22.07 (v11) +- Upgrade to NixOS v22.05 (Quokka)! +- Add `lib.map.array` +- Improve `nixos` Script - Use [`treefmt`](https://github.com/numtide/treefmt) for Formatting Code ### 22.04 (v10) @@ -583,7 +586,7 @@ You can navigate to the `README`'s present in the various directories to know mo </details> -> Last Updated: **April** 2022 +> Last Updated: **July** 2022 If you like this project, consider leaving a [star](https://github.com/maydayv7/dotfiles) diff --git a/files/default.nix b/files/default.nix @@ -44,7 +44,6 @@ in rec { accounts = readFile ./gnome/accounts.conf; dconf = ./gnome/dconf.nix; iso = readFile ./gnome/iso; - shell = readFile ./gnome/gnome-shell.css; syntax = readFile ./gnome/nix.lang; theme = readFile ./gnome/tango-dark.xml; }; diff --git a/files/gnome/dconf.nix b/files/gnome/dconf.nix @@ -1,5 +1,6 @@ { config, + sys, lib, files, ... @@ -124,6 +125,7 @@ in { }; "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; clock-show-weekday = true; document-font-name = "Product Sans 11"; enable-animations = true; @@ -132,8 +134,6 @@ in { font-hinting = "slight"; font-name = "Product Sans Medium, Medium 11"; gtk-im-module = "gtk-im-context-simple"; - gtk-theme = "Adwaita-dark"; - icon-theme = "Papirus-Dark"; locate-pointer = true; monospace-font-name = "MesloLGS NF 10"; show-battery-percentage = true; @@ -223,6 +223,7 @@ in { use-google-search-suggestions = true; }; + "org/gnome/epiphany/sync".sync-device-name = sys.networking.hostName; "org/gnome/epiphany/web" = { default-zoom-level = 1.0; enable-mouse-gestures = true; @@ -343,7 +344,7 @@ in { "avatar@pawel.swiszcz.com" "burn-my-windows@schneegans.github.com" "caffeine@patapon.info" - "clipboard-indicator@tudmotu.com" + "clipboard-history@alexsaveau.dev" "color-picker@tuberry" "color-picker@tuberry" "compiz-alike-magic-lamp-effect@hermes83.github.com" @@ -372,7 +373,7 @@ in { "org.gnome.Nautilus.desktop" "org.gnome.Terminal.desktop" "org.gnome.gedit.desktop" - "gnome-control-center.desktop" + "org.gnome.Settings.desktop" ]; }; @@ -461,6 +462,14 @@ in { user-enabled = true; }; + "org/gnome/shell/extensions/com/github/hermes83/compiz-windows-effect" = { + friction = 6.0; + mass = 50.0; + resize-effect = true; + speedup-factor-divider = 10.0; + spring-k = 5.0; + }; + "org/gnome/shell/extensions/color-picker" = { color-picker-shortcut = ["<Super>c"]; enable-shortcut = true; @@ -470,16 +479,11 @@ in { persistent-mode = true; }; - "org/gnome/shell/extensions/clipboard-indicator" = { - cache-size = 1051; - clear-history = []; - confirm-clear = false; - history-size = 70; - move-item-first = true; - next-entry = []; - prev-entry = []; + "org/gnome/shell/extensions/clipboard-history" = { + disable-down-arrow = true; strip-text = true; toggle-menu = ["<Super>v"]; + window-width-percentage = 25; }; "org/gnome/shell/extensions/custom-hot-corners-extended/misc" = { @@ -581,9 +585,10 @@ in { "vitalsMenu" "dwellClick" "lockkeys" - "clipboardIndicator" + "Clipboard History Indicator" "a11y" "keyboard" + "screenRecording" ]; }; @@ -649,7 +654,7 @@ in { stockgs-keep-top-panel = false; stockgs-panelbtn-click-only = false; taskbar-locked = false; - trans-bg-color = "#282828"; + trans-bg-color = "#232323"; trans-dynamic-anim-target = 1.0; trans-dynamic-anim-time = 200; trans-dynamic-behavior = "MAXIMIZED_WINDOWS"; diff --git a/files/gnome/gnome-shell.css b/files/gnome/gnome-shell.css @@ -1,3 +0,0 @@ -#panel { - background: rgba(40, 40, 40, 1); -} diff --git a/files/images/desktop.png b/files/images/desktop.png Binary files differ. diff --git a/files/vscode/settings.json b/files/vscode/settings.json @@ -8,6 +8,7 @@ "editor.suggest.showStatusBar": true, "editor.unfoldOnClickAfterEndOfLine": true, "explorer.incrementalNaming": "smart", + "explorer.confirmDelete": false, "explorer.openEditors.visible": 7, "extensions.autoCheckUpdates": false, "extensions.autoUpdate": false, diff --git a/flake.lock b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1648475189, - "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", + "lastModified": 1653594315, + "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", + "rev": "184349d8149436748986d1bdba087e4149e9c160", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "filter": { "locked": { - "lastModified": 1649838635, - "narHash": "sha256-P1h48+l9vUvMz4JwHBgkTXiX6mE8oYR75vBVUbe6Cuc=", + "lastModified": 1653590866, + "narHash": "sha256-E4yKIrt/S//WfW5D9IhQ1dVuaAy8RE7EiCMfnbrOC78=", "owner": "numtide", "repo": "nix-filter", - "rev": "40a58baa248a8b335e2d66ca258a74248af9d834", + "rev": "3e81a637cdf9f6e9b39aeb4d6e6394d1ad158e16", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1651332470, - "narHash": "sha256-98Sgq7ZFqtaqjlXzediTKC3I6gR/y8cci2k8q16nL9U=", + "lastModified": 1654096541, + "narHash": "sha256-GDy7RnRH7idcF6uzNQXPII14OWgb49ExwAu8MHeZTtI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f590aa8f7a7a7a312f01cbc5a802609fbe766d5c", + "rev": "0b4e36ef5347ef4fefd469279490851b2bfa5116", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1650997411, - "narHash": "sha256-r4a3qsSv5UTtx+pxTUEdOphBkwTx1+AAVog3c457A0M=", + "lastModified": 1653339081, + "narHash": "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "3cdf22c79bc80910e2b610cd59fcb8408354ddbc", + "rev": "fb3ee0f618b8c80dea1239691b15dfeb4bb46331", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "hardware": { "locked": { - "lastModified": 1650522846, - "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=", + "lastModified": 1654057797, + "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "6b4ebea9093c997c5f275c820e679108de4871ab", + "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", "type": "github" }, "original": { @@ -138,16 +138,16 @@ ] }, "locked": { - "lastModified": 1651007218, - "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=", + "lastModified": 1654113405, + "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d14adb99f3fb562ec74ad18c032efc154b438034", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } @@ -159,15 +159,15 @@ "flake-utils" ], "nixpkgs": [ - "unstable" + "stable" ] }, "locked": { - "lastModified": 1649054408, - "narHash": "sha256-wz8AH7orqUE4Xog29WMTqOYBs0DMj2wFM8ulrTRVgz0=", + "lastModified": 1652714503, + "narHash": "sha256-qQKVEfDe5FqvGgkZtg5Pc491foeiDPIOeycHMqnPDps=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e5e7b3b542e7f4f96967966a943d7e1c07558042", + "rev": "521a524771a8e93caddaa0ac1d67d03766a8b0b3", "type": "github" }, "original": { @@ -213,28 +213,60 @@ }, "library": { "locked": { - "lastModified": 1645317664, - "narHash": "sha256-KmeflyKQXMtqsxqlRX+94O6bUCBngqR6seqjd6UIbZM=", + "lastModified": 1653785473, + "narHash": "sha256-kqSk70xGTRfmJi2XPfpxF4ckfrlB0bf9vmN1V3aydTA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1637168cfad105ccd522ae59648ce0289966c565", + "rev": "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06", "type": "github" }, "original": { "owner": "nix-community", "ref": "master", "repo": "nixpkgs.lib", - "rev": "1637168cfad105ccd522ae59648ce0289966c565", + "rev": "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06", + "type": "github" + } + }, + "nixpkgs-21_11": { + "locked": { + "lastModified": 1653819578, + "narHash": "sha256-a1vaUl6VZz1NsWxMw0i5lRyHIOVUIuMZdQzV+4s+rY8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "baa82d4b626288c7439eeea073a18aabbe435991", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-22_05": { + "locked": { + "lastModified": 1653822412, + "narHash": "sha256-xZwMDQ8MdNiTwE8dcKAX1h3qCmLtuudNGxmFUX3xIes=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "db78278ff296cf21eca7e8c08ee99707387a54fa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.05", + "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1651362768, - "narHash": "sha256-mjIejm8tbUgZwNQxL5TaxMbaPCJndX47lV72urKD6g4=", + "lastModified": 1654367137, + "narHash": "sha256-xufB/+qvk/7rh7qrwZbzru1kTu8nsmNWBNQkYbdS84Q=", "owner": "nix-community", "repo": "NUR", - "rev": "8fb1c0c3e4f92251c29ead8d61b0321a351615ec", + "rev": "86ff2d098bce1d623232f4886027a1d61317b195", "type": "github" }, "original": { @@ -270,14 +302,16 @@ "inputs": { "nixpkgs": [ "stable" - ] + ], + "nixpkgs-21_11": "nixpkgs-21_11", + "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1649756291, - "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=", + "lastModified": 1653827546, + "narHash": "sha256-va51HFf7UwktvriIbe9pjRPMr7p8IaxrwcDlZe7twzI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8", + "rev": "36b5901782e7fbfc191cace910f67f8b8743f678", "type": "github" }, "original": { @@ -288,27 +322,27 @@ }, "stable": { "locked": { - "lastModified": 1651093906, - "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=", + "lastModified": 1654275867, + "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49", + "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, "unstable": { "locked": { - "lastModified": 1651007983, - "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", + "lastModified": 1654230545, + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", + "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "type": "github" }, "original": { @@ -323,11 +357,11 @@ "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1647259887, - "narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=", + "lastModified": 1652704544, + "narHash": "sha256-UTKE33tYgCmDszaVyWA33a8mtegM5xfH4fH8w4y6TxA=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46", + "rev": "f8d6d1f87b6177e3bc674c29f247bdbf897ba274", "type": "github" }, "original": { @@ -378,11 +412,11 @@ ] }, "locked": { - "lastModified": 1651352845, - "narHash": "sha256-Zpq1bLx2LfBIE5NnuasdnBvd8g8IiO70LDCxq0CCQks=", + "lastModified": 1654285609, + "narHash": "sha256-FkzWM0GIMk+7njNJ3GyLMwiZe9GC+KaLsxrfcQG1tiA=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "8d4eeb8127afa2a8a19cb67231d9cde0209f6c9b", + "rev": "54ac29dfe5d8d34f28321b34d0ef635f88048709", "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.04 (v10) # +# Version -> 22.07 (v11) # # --------------------------------------- # # 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-21.11"; + stable.url = "github:NixOS/nixpkgs?ref=nixos-22.05"; # Unstable Packages Repository unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; @@ -84,7 +84,7 @@ owner = "nix-community"; repo = "nixpkgs.lib"; ref = "master"; - rev = "1637168cfad105ccd522ae59648ce0289966c565"; + rev = "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06"; }; # Flake Compatibility Library @@ -108,7 +108,7 @@ # User Home Manager home = { - url = "github:nix-community/home-manager?ref=release-21.11"; + url = "github:nix-community/home-manager?ref=release-22.05"; inputs.nixpkgs.follows = "stable"; }; @@ -131,7 +131,7 @@ # Pre-Commit Hooks hooks = { url = "github:cachix/pre-commit-hooks.nix"; - inputs.nixpkgs.follows = "unstable"; + inputs.nixpkgs.follows = "stable"; inputs.flake-utils.follows = "utils/flake-utils"; }; diff --git a/modules/base/console.nix b/modules/base/console.nix @@ -1,7 +1,6 @@ { config, pkgs, - files, ... }: let font = builtins.head config.fonts.fontconfig.defaultFonts.monospace; @@ -26,26 +25,23 @@ in { }; # Essential Utilities - environment = { - persist.dirs = [files.path.system]; - systemPackages = with pkgs; [ - cryptsetup - gparted - inxi - killall - mkpasswd - custom.nixos - ntfsprogs - parted - pciutils - rsync - sdparm - smartmontools - unrar - unzip - usbutils - wget - ]; - }; + environment.systemPackages = with pkgs; [ + cryptsetup + gparted + inxi + killall + mkpasswd + custom.nixos + ntfsprogs + parted + pciutils + rsync + sdparm + smartmontools + unrar + unzip + usbutils + wget + ]; }; } diff --git a/modules/default.nix b/modules/default.nix @@ -44,7 +44,7 @@ in { pkgs = self.channels."${system}"."${channel}"; # System Libraries - util = lib'.util; + inherit (lib') util; lib' = extend (final: prev: with input.lib; {inherit nixosSystem trivial;}); diff --git a/modules/gui/gnome.nix b/modules/gui/gnome.nix @@ -45,13 +45,13 @@ in { }; services = { - dbus.packages = [pkgs.gnome.dconf]; + dbus.packages = [pkgs.dconf]; udev.packages = [pkgs.gnome.gnome-settings-daemon]; touchegg.enable = true; + telepathy.enable = true; gnome = { chrome-gnome-shell.enable = true; core-developer-tools.enable = true; - experimental-features.realtime-scheduling = true; gnome-initial-setup.enable = true; gnome-keyring.enable = true; gnome-remote-desktop.enable = true; @@ -68,8 +68,8 @@ in { gtk = { enable = true; theme = { - name = "Adwaita-dark"; - package = pkgs.gnome.gnome-themes-extra; + name = "adw-gtk3-dark"; + package = pkgs.custom.adw-gtk3; }; iconTheme = { @@ -122,8 +122,13 @@ in { # X11 Gestures ".config/touchegg/touchegg.conf".text = gestures; - # Custome GNOME Shell Theme - ".themes/Adwaita/gnome-shell/gnome-shell.css".text = gnome.shell; + # Prevent Suspension on lid close + ".config/autostart/ignore-lid-switch-tweak.desktop".text = '' + [Desktop Entry] + Type=Application + Name=ignore-lid-switch-tweak + Exec=${pkgs.gnome.gnome-tweaks}/libexec/gnome-tweak-tool-lid-inhibitor + ''; # gEdit Color Scheme ".local/share/gtksourceview-4/styles/tango-dark.xml".text = @@ -150,10 +155,12 @@ in { environment.systemPackages = with pkgs.gnome; [ # GNOME Apps + gedit gnome-boxes gnome-dictionary gnome-notes gnome-sound-recorder + gnome-terminal gnome-tweaks polari @@ -172,7 +179,7 @@ in { giara gimp gnome-podcasts - gnome-passwordsafe + gnome-secrets gthumb kooha lollypop @@ -188,11 +195,12 @@ in { with unstable.gnomeExtensions // gnomeExtensions; [ # GNOME Shell Extensions add-username-to-top-panel + alphabetical-app-grid appindicator avatar burn-my-windows caffeine - clipboard-indicator + clipboard-history color-picker compiz-windows-effect compiz-alike-magic-lamp-effect @@ -207,7 +215,7 @@ in { screenshot-locations sound-output-device-chooser timepp - custom.top-bar-organizer + top-bar-organizer vitals worksapce-dry-names x11-gestures @@ -261,8 +269,8 @@ in { environment.systemPackages = with pkgs.gnome; [ epiphany gedit + pkgs.gnome-console gnome-system-monitor - pkgs.kgx nautilus ]; diff --git a/modules/hardware/filesystem.nix b/modules/hardware/filesystem.nix @@ -7,7 +7,7 @@ ... }: let inherit (builtins) filter listToAttrs mapAttrs; - inherit (lib) hasPrefix mkAfter mkIf mkMerge mkOption nameValuePair optional remove types; + inherit (lib) hasPrefix mkAfter mkIf mkMerge mkOption nameValuePair optional types; inherit (config.hardware) filesystem; in { imports = [inputs.impermanence.nixosModule]; @@ -119,7 +119,7 @@ in { }; } // listToAttrs (map (dir: nameValuePair dir {neededForBoot = true;}) - (filter (hasPrefix "/etc") (remove "/etc/nixos" config.environment.persist.dirs))); + (filter (hasPrefix "/etc") config.environment.persist.dirs)); # Boot Settings boot = { @@ -142,7 +142,7 @@ in { "${files.persist}" = { files = ["/etc/machine-id"] ++ config.environment.persist.files; directories = - ["/var/log" "/var/lib/AccountsService"] + ["/etc/nixos" "/var/log" "/var/lib/AccountsService"] ++ config.environment.persist.dirs; }; diff --git a/modules/nix/default.nix b/modules/nix/default.nix @@ -11,12 +11,12 @@ with {inherit (lib.util.map) array;}; { config = { # Utilities user.persist.dirs = [".cache/nix" ".cache/manix"]; - environment.systemPackages = [pkgs.cachix] ++ array (import ./format.nix) pkgs.unstable; + environment.systemPackages = [pkgs.cachix] ++ array (import ./format.nix) pkgs; # Settings nix = { # Version - package = pkgs.nixFlakes; + package = pkgs.nix; # Garbage Collection autoOptimiseStore = true; diff --git a/modules/shell/default.nix b/modules/shell/default.nix @@ -61,10 +61,7 @@ with {inherit (lib) mkEnableOption mkIf mkMerge util;}; { # DirENV Support direnv = { enable = true; - nix-direnv = { - enable = true; - enableFlakes = true; - }; + nix-direnv.enable = true; }; # Bat Configuration diff --git a/modules/user/default.nix b/modules/user/default.nix @@ -147,7 +147,10 @@ in { useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "bak"; - extraSpecialArgs = {inherit lib inputs files;}; + extraSpecialArgs = { + inherit lib inputs files; + sys = config; + }; users = mapAttrs (_: value: {imports = value.homeConfig;}) settings; }; }; diff --git a/packages/adw-gtk3.nix b/packages/adw-gtk3.nix @@ -0,0 +1,42 @@ +{ + lib, + pkgs, + ... +}: +with pkgs; + stdenvNoCC.mkDerivation rec { + pname = "adw-gtk3"; + version = "v2.0"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = version; + sha256 = "sha256-gFyNbgOzX+WVo0MP+VQvxVTnLV7Bhgo1fUnjuAku/Sc="; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + ]; + + postPatch = '' + chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "The theme from libadwaita ported to GTK-3"; + homepage = "https://github.com/lassekongo83/adw-gtk3"; + license = licenses.lgpl21Only; + platforms = platforms.linux; + maintainers = ["maydayv7"]; + }; + } diff --git a/packages/dotfiles.nix b/packages/dotfiles.nix @@ -6,8 +6,8 @@ }: pkgs.stdenv.mkDerivation rec { pname = "Dotfiles"; - version = "v10"; - longVersion = "22.04"; + version = "v11"; + longVersion = "22.07"; 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 = "ad2175d4a479a1154de42624e5d358d3b5aa9f27"; - sha256 = "sha256-w7AOvC4Z8rKfPuznj9oOenSXtgXGkIK4vHOK4uiCZPc="; + rev = "44606f062f0f34c35ab98a6bda132bc3ca5741fa"; + sha256 = "sha256-BV79F0pR0oMHAEh1LCCAGtTxRUdEWBGHKuQNTZ9r11A="; } 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 = "v13"; + version = "v16"; src = fetchzip { stripRoot = false; url = "https://extensions.gnome.org/extension-data/flypieschneegans.github.com.${version}.shell-extension.zip"; - sha256 = "sha256-7O7Kii9wQS5cg8UIEEyf2ePoGZ7XtpzE+4p+zwxp+Go="; + sha256 = "sha256-YmPEeHNauWGnd9lIs9ymq3wL3Cu2FgRMgueyXzKTXC0="; }; dontBuild = true; diff --git a/packages/overlays/gnome-terminal.nix b/packages/overlays/gnome-terminal.nix @@ -12,8 +12,8 @@ final: prev: { ++ [ (prev.fetchpatch { name = "transparency.patch"; - sha256 = "0y116dww3j1mk4s2qklkgw8jjmvdfdpwynbijq0iwazvlggmsilk"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/transparency.patch?h=gnome-terminal-transparency&id=7dd7cd2471e42af8130cda7905b2b2c2a334ac4b"; + 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/miscellaneous.nix b/packages/overlays/miscellaneous.nix @@ -1,4 +1,4 @@ final: prev: { ## Miscellaneous Overlays ## - prettier = final.nodePackages.prettier; + inherit (final.nodePackages) prettier; } diff --git a/packages/overlays/mutter-rounded.nix b/packages/overlays/mutter-rounded.nix @@ -0,0 +1,43 @@ +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/overlays/nixFlakes.nix b/packages/overlays/nixFlakes.nix @@ -1,17 +0,0 @@ -final: prev: { - # Update Nix to Latest Version and Patch using unmerged PRs - nixFlakes = prev.nixFlakes.overrideAttrs (old: rec { - version = "2.8+"; - longVersion = builtins.replaceStrings ["+"] [""] version + ".0"; - - src = prev.fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = longVersion; - sha256 = "sha256-gWYNlEyleqkPfxtGXeq6ggjzJwcXJVdieJxA1Obly9s="; - }; - - patches = []; - buildInputs = old.buildInputs ++ [final.nlohmann_json]; - }); -} diff --git a/packages/top-bar-organizer.nix b/packages/top-bar-organizer.nix @@ -1,40 +0,0 @@ -{ - 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/packages/wine/7zip.nix b/packages/wine/7zip.nix @@ -5,6 +5,7 @@ wine, ... }: let + inherit (builtins) concatLists map; inherit (pkgs) copyDesktopItems fetchurl makeDesktopItem; inherit (lib.wine."${system}") copyDesktopIcons makeDesktopIcon mkWindowsApp; in @@ -39,25 +40,18 @@ in ''; desktopItems = let - mimeType = builtins.concatStringsSep ";" [ - "application/epub+zip" - "application/x-zip-compressed-fb2" - "application/x-cbt" - "application/x-cb7" - "application/x-7z-compressed" - "application/vnd.rar" - "application/x-tar" - "application/zip" - ]; + textTypes = map (n: "text/" + n) []; + appTypes = map (n: "application/" + n) ["epub+zip" "x-zip-compressed-fb2" "x-cbt" "x-cb7" "x-7z-compressed" "vnd.rar" "x-tar" "zip"]; + mimeTypes = concatLists [textTypes appTypes]; in [ (makeDesktopItem { - inherit mimeType; + inherit mimeTypes; name = pname; exec = pname; icon = pname; desktopName = "7-Zip"; genericName = "Archive Manager"; - categories = "Office;"; + categories = ["Office" "Utility"]; }) ]; diff --git a/scripts/nixos.nix b/scripts/nixos.nix @@ -94,7 +94,7 @@ in wine.mkwindowsapp-tools zfs ] - ++ array (import ../modules/nix/format.nix) pkgs.unstable; + ++ array (import ../modules/nix/format.nix) pkgs; text = '' set +eu diff --git a/shells/format.nix b/shells/format.nix @@ -1,5 +1,5 @@ pkgs: { name = "Formatter"; shellHook = ''echo "## Formatting Shell ##"''; - packages = (import ../lib/map.nix {lib = pkgs.lib;}).array (import ../modules/nix/format.nix) pkgs.unstable; + packages = (import ../lib/map.nix {inherit (pkgs) lib;}).array (import ../modules/nix/format.nix) pkgs; } diff --git a/site/content/now.md b/site/content/now.md @@ -12,4 +12,4 @@ This page is inspired by [NowNowNow](https://nownownow.com) Nothing much else really! ;) -> Last Updated: **April** 2022 +> Last Updated: **July** 2022
