feat(nixos): back to swayfx and away from catppuccin gtk
This commit is contained in:
parent
92a9167fe4
commit
0238e20e3a
GPG key ID:
3786770EDBC2B481
8 changed files with 59 additions and 108 deletions
90
flake.lock
90
flake.lock
|
|
@ -57,11 +57,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707530346,
|
||||
"narHash": "sha256-LGvGeDwQtVQ4Pfa7JJKESAUg3n7Dy9d4kVCZf69kDRY=",
|
||||
"lastModified": 1708962818,
|
||||
"narHash": "sha256-oN4D8YBbwxz/YHyV1i+y+ujUKAmhIeSqGBWFIWyQnGw=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "vscode",
|
||||
"rev": "a5c28e9319556c696e184a2f2f49813288063ed6",
|
||||
"rev": "49632377cb02b45bc47c929bbc2874de54dbbda2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -77,11 +77,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708231718,
|
||||
"narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=",
|
||||
"lastModified": 1709771483,
|
||||
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "0e6857fa1d632637488666c08e7b02c08e3178f8",
|
||||
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -97,11 +97,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706830856,
|
||||
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
|
||||
"lastModified": 1709336216,
|
||||
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
|
||||
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -115,11 +115,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -133,11 +133,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -174,11 +174,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708591310,
|
||||
"narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
|
||||
"lastModified": 1710043165,
|
||||
"narHash": "sha256-R34OB9q1JMqbIQlnuccWFGDYG0sWEALHxjL6kQGVR44=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
|
||||
"rev": "fbec89838763831bd92e1b09222dc9477942930f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -194,11 +194,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708585389,
|
||||
"narHash": "sha256-CtKgXtHjOWAJQF7FF2XJFcVwKH0A0xE1xj1GnHGf7UI=",
|
||||
"lastModified": 1710054510,
|
||||
"narHash": "sha256-kekC5uJuvmaTjqWhm0Ejun6EnW4xNn5+7q98stKIOzM=",
|
||||
"owner": "nekowinston",
|
||||
"repo": "nur",
|
||||
"rev": "10b5d3f61ab8d6bb1bf236b183800fccaa7a3a78",
|
||||
"rev": "4918b7a2db2cd98856be7db953f5100f3a359bf0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -214,11 +214,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708225687,
|
||||
"narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
|
||||
"lastModified": 1710040110,
|
||||
"narHash": "sha256-PNAV8VdZkNoSGQHGQWDefNarl0BtKjVMCCzu16+vsr4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
|
||||
"rev": "851fcfd130597c5c91071d46275111522d4fd595",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -238,11 +238,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708564557,
|
||||
"narHash": "sha256-aG1OY88ntSeoLbS8+mAqU/m8rMC2q5tfmGFdLRYjzOs=",
|
||||
"lastModified": 1710033560,
|
||||
"narHash": "sha256-jLEVnMZBxZ/0ziOvzrM9t5NvrwYFvhWLG9lh+ZS6Hhs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "8b06e691e817a0de06bd22f610e778937ab7ade0",
|
||||
"rev": "25aca378639791d20fe0bd9bf0189130369447c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -253,11 +253,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1708118438,
|
||||
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
|
||||
"lastModified": 1709703039,
|
||||
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
|
||||
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -269,11 +269,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1708475490,
|
||||
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
|
||||
"lastModified": 1709703039,
|
||||
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
|
||||
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -285,11 +285,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1708597774,
|
||||
"narHash": "sha256-dofnVMqnuLFiVUGl5l3J27byhnWehd3QvFhLZWczqBc=",
|
||||
"lastModified": 1710054796,
|
||||
"narHash": "sha256-hw7nr8jjhqPRQ3GwUsyubCpnj8S+hn8JFSebKTSdf7Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "f2af010f46a7eb25cbeef01f6942eb3b14fbd1da",
|
||||
"rev": "85ccf22bc39caf0cef0e031d47a05638baa7a08e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -358,11 +358,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708231627,
|
||||
"narHash": "sha256-beDYL9tOe1pw1kLChFbSSSl5wM81rat6t96baqG4+xM=",
|
||||
"lastModified": 1710036830,
|
||||
"narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "5d4170f50065cb04cef941831786a50637c4e20b",
|
||||
"rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -432,11 +432,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684517665,
|
||||
"narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=",
|
||||
"lastModified": 1709622318,
|
||||
"narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-vscode-server",
|
||||
"rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6",
|
||||
"rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -456,11 +456,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708331102,
|
||||
"narHash": "sha256-nTOiQvmbB9HtxeTWgXdd2FH2w3cOyOIIrPUm+YtDVyY=",
|
||||
"lastModified": 1709980437,
|
||||
"narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-wsl",
|
||||
"rev": "e6bbc01a35626b8db741bcbc0af807379d372218",
|
||||
"rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -14,9 +14,11 @@ in {
|
|||
appindicator
|
||||
blur-my-shell
|
||||
mullvad-indicator
|
||||
native-window-placement
|
||||
noannoyance-fork
|
||||
pop-shell
|
||||
user-themes
|
||||
pkgs.pop-launcher
|
||||
];
|
||||
|
||||
dconf.settings = with lib.hm.gvariant; {
|
||||
|
|
@ -43,7 +45,7 @@ in {
|
|||
favorite-apps = ["org.gnome.Nautilus.desktop" "chromium-browser.desktop" "org.wezfurlong.wezterm.desktop"];
|
||||
};
|
||||
"org/gnome/shell/extensions/user-theme" = {
|
||||
name = "Catppuccin-Frappe-Compact-Pink-Dark";
|
||||
name = "WhiteSur-Light";
|
||||
};
|
||||
|
||||
# wallpaper
|
||||
|
|
|
|||
|
|
@ -16,32 +16,12 @@ in {
|
|||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.catppuccin-papirus-folders.override {
|
||||
accent = "pink";
|
||||
flavor = "frappe";
|
||||
};
|
||||
name = "WhiteSur";
|
||||
package = pkgs.whitesur-icon-theme;
|
||||
};
|
||||
theme = {
|
||||
name = "Catppuccin-Frappe-Compact-Pink-Dark";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
accents = ["pink"];
|
||||
variant = "frappe";
|
||||
size = "compact";
|
||||
};
|
||||
};
|
||||
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
|
||||
gtk2.extraConfig = ''
|
||||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle="hintslight"
|
||||
gtk-xft-rgba="rgb"
|
||||
'';
|
||||
gtk3.extraConfig = {
|
||||
gtk-xft-antialias = 1;
|
||||
gtk-xft-hinting = 1;
|
||||
gtk-xft-hintstyle = "hintslight";
|
||||
gtk-xft-rgba = "rgb";
|
||||
name = "WhiteSur-Light";
|
||||
package = pkgs.whitesur-gtk-theme;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@
|
|||
"workbench.colorTheme": "Catppuccin Latte",
|
||||
"workbench.iconTheme": "material-icon-theme",
|
||||
"workbench.preferredDarkColorTheme": "Catppuccin Mocha",
|
||||
"workbench.layoutControl.enabled": false,
|
||||
"workbench.preferredLightColorTheme": "Catppuccin Latte",
|
||||
"workbench.productIconTheme": "icons-carbon",
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
package = pkgs.swayfx;
|
||||
extraPackages = with pkgs; [
|
||||
foot
|
||||
swaylock-effects
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}: {
|
||||
imports = [./hardware.nix];
|
||||
|
||||
dotfiles.desktop = "gnome";
|
||||
dotfiles.desktop = "sway";
|
||||
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{
|
||||
pkgs ? import <nixpkgs> {},
|
||||
accents ? ["pink"],
|
||||
size ? "compact",
|
||||
lightFlavor ? "latte",
|
||||
darkFlavor ? "mocha",
|
||||
}: let
|
||||
inherit (builtins) substring stringLength;
|
||||
inherit (pkgs) lib;
|
||||
capitalize = s: (lib.toUpper (substring 0 1 s)) + (substring 1 (stringLength s) s);
|
||||
darkName = capitalize darkFlavor;
|
||||
lightName = capitalize lightFlavor;
|
||||
in
|
||||
pkgs.symlinkJoin {
|
||||
name = "Catppuccin-Compact-Pink";
|
||||
paths = [
|
||||
(pkgs.catppuccin-gtk.override {
|
||||
inherit accents size;
|
||||
variant = darkFlavor;
|
||||
})
|
||||
(pkgs.catppuccin-gtk.override {
|
||||
inherit accents size;
|
||||
variant = lightFlavor;
|
||||
})
|
||||
];
|
||||
postBuild = ''
|
||||
cd $out/share/themes
|
||||
mv -v Catppuccin-${lightName}-Compact-Pink-Light Catppuccin-Compact-Pink
|
||||
mv -v Catppuccin-${lightName}-Compact-Pink-Light-hdpi Catppuccin-Compact-Pink-hdpi
|
||||
mv -v Catppuccin-${lightName}-Compact-Pink-Light-xhdpi Catppuccin-Compact-Pink-xhdpi
|
||||
mv -v Catppuccin-${darkName}-Compact-Pink-Dark Catppuccin-Compact-Pink-dark
|
||||
mv -v Catppuccin-${darkName}-Compact-Pink-Dark-hdpi Catppuccin-Compact-Pink-hdpi-dark
|
||||
mv -v Catppuccin-${darkName}-Compact-Pink-Dark-xhdpi Catppuccin-Compact-Pink-xhdpi-dark
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{inputs}: [
|
||||
inputs.nix-vscode-extensions.overlays.default
|
||||
inputs.catppuccin-vsc.overlays.default
|
||||
inputs.nix-vscode-extensions.overlays.default
|
||||
(final: prev: let
|
||||
srcs = prev.callPackages ../_sources/generated.nix {};
|
||||
in {
|
||||
|
|
@ -12,7 +12,9 @@
|
|||
})
|
||||
];
|
||||
});
|
||||
sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
|
||||
swayfx-unwrapped = inputs.swayfx.packages.${prev.system}.swayfx-unwrapped.overrideAttrs (old: {
|
||||
buildInputs = (prev.lib.remove prev.wlroots old.buildInputs) ++ [prev.wlroots_0_16];
|
||||
});
|
||||
yabai = prev.yabai.overrideAttrs (_: {
|
||||
inherit (srcs.yabai) version src;
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue