update deps and fix theming?
This commit is contained in:
parent
8383063869
commit
6b426476ad
16
flake.lock
16
flake.lock
|
|
@ -13,11 +13,11 @@
|
||||||
"sf-pro": "sf-pro"
|
"sf-pro": "sf-pro"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752383772,
|
"lastModified": 1758228441,
|
||||||
"narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
|
"narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=",
|
||||||
"owner": "Lyndeno",
|
"owner": "Lyndeno",
|
||||||
"repo": "apple-fonts.nix",
|
"repo": "apple-fonts.nix",
|
||||||
"rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
|
"rev": "aba9944f6606a69ebedf7bfb723316139eec3f72",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -130,11 +130,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740828860,
|
"lastModified": 1757745802,
|
||||||
"narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
|
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
|
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -328,7 +328,7 @@
|
||||||
"sf-compact": {
|
"sf-compact": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
|
"narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
|
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
|
||||||
},
|
},
|
||||||
|
|
@ -376,7 +376,7 @@
|
||||||
"sf-pro": {
|
"sf-pro": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
|
"narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
|
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,24 @@
|
||||||
{pkgs, lib, super-config, ...}:
|
{pkgs, ...}:
|
||||||
let
|
let
|
||||||
user = import ../data/user.nix {};
|
user = import ../data/user.nix {};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
|
./development
|
||||||
|
./emacs.nix
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
./sway.nix
|
./git-ssh.nix
|
||||||
./hyprlock_idle.nix
|
./hyprlock_idle.nix
|
||||||
|
./libinput.nix
|
||||||
|
./mako.nix
|
||||||
|
./rofi.nix
|
||||||
|
./sway.nix
|
||||||
|
./syncthing.nix
|
||||||
|
./theme.nix
|
||||||
|
./udiskie.nix
|
||||||
./wallpapers.nix
|
./wallpapers.nix
|
||||||
./waybar.nix
|
./waybar.nix
|
||||||
./udiskie.nix
|
|
||||||
./mako.nix
|
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
./rofi.nix
|
|
||||||
./libinput.nix
|
|
||||||
./git-ssh.nix
|
|
||||||
./emacs.nix
|
|
||||||
./syncthing.nix
|
|
||||||
./development
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.nh = {
|
programs.nh = {
|
||||||
|
|
@ -36,43 +37,14 @@ in {
|
||||||
portal = {
|
portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
|
xdg-desktop-portal
|
||||||
xdg-desktop-portal-wlr
|
xdg-desktop-portal-wlr
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
|
xdg-desktop-portal-xapp
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
gtk = {
|
|
||||||
enable = true;
|
|
||||||
theme = {
|
|
||||||
name = "Breeze-Dark";
|
|
||||||
package = pkgs.kdePackages.breeze-gtk;
|
|
||||||
};
|
|
||||||
iconTheme = {
|
|
||||||
name = "Papirus-Dark";
|
|
||||||
package = pkgs.papirus-icon-theme;
|
|
||||||
};
|
|
||||||
cursorTheme = {
|
|
||||||
name = "WhiteSur-cursors";
|
|
||||||
package = pkgs.whitesur-cursors;
|
|
||||||
size = 24;
|
|
||||||
};
|
|
||||||
|
|
||||||
gtk3.extraConfig = {
|
|
||||||
gtk-application-prefer-dark-theme = super-config.darkMode == true;
|
|
||||||
};
|
|
||||||
|
|
||||||
gtk4.extraConfig = {
|
|
||||||
gtk-application-prefer-dark-theme = super-config.darkMode == true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
dconf.settings = {
|
|
||||||
"org/gnome/desktop/interface" = {
|
|
||||||
color-scheme = lib.optionals (super-config.darkMode == true) "prefer-dark";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
fonts.fontconfig.enable = true;
|
fonts.fontconfig.enable = true;
|
||||||
home = {
|
home = {
|
||||||
stateVersion = "25.05";
|
stateVersion = "25.05";
|
||||||
|
|
@ -89,16 +61,6 @@ in {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
};
|
};
|
||||||
|
|
||||||
pointerCursor = {
|
|
||||||
gtk.enable = true;
|
|
||||||
x11.enable = true;
|
|
||||||
x11.defaultCursor = "WhiteSur-cursors";
|
|
||||||
name = "WhiteSur-cursors";
|
|
||||||
package = pkgs.whitesur-cursors;
|
|
||||||
size = 32;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# Add your global packages here
|
# Add your global packages here
|
||||||
mpv
|
mpv
|
||||||
|
|
@ -128,6 +90,12 @@ in {
|
||||||
bitwarden-desktop
|
bitwarden-desktop
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
|
|
||||||
|
# for running wayland apps over ssh
|
||||||
|
waypipe
|
||||||
|
pkgs.unstable.deskflow
|
||||||
|
|
||||||
|
foliate
|
||||||
|
|
||||||
# file manager
|
# file manager
|
||||||
nemo-with-extensions
|
nemo-with-extensions
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.hypridle = lib.optionals (super-config.enableHypridle == true) {
|
services.hypridle = lib.mkIf (super-config.enableHypridle == true) {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = let
|
settings = let
|
||||||
idle_timeout = "300"; # 5 minutes
|
idle_timeout = "300"; # 5 minutes
|
||||||
|
|
|
||||||
100
home/theme.nix
Normal file
100
home/theme.nix
Normal file
|
|
@ -0,0 +1,100 @@
|
||||||
|
# Theme for graphical apps
|
||||||
|
{ lib, super-config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
(catppuccin-kvantum.override {
|
||||||
|
accent = "blue";
|
||||||
|
variant = "mocha";
|
||||||
|
})
|
||||||
|
papirus-folders
|
||||||
|
];
|
||||||
|
|
||||||
|
# Cursor setup
|
||||||
|
home.pointerCursor = {
|
||||||
|
# name = "Catppuccin-Mocha-Lavender-Cursors";
|
||||||
|
# package = pkgs.catppuccin-cursors.mochaLavender;
|
||||||
|
name = "WhiteSur-cursors";
|
||||||
|
package = pkgs.whitesur-cursors;
|
||||||
|
gtk.enable = true;
|
||||||
|
x11.enable = true;
|
||||||
|
x11.defaultCursor = "WhiteSur-cursors";
|
||||||
|
size = 24;
|
||||||
|
};
|
||||||
|
|
||||||
|
# GTK Setup
|
||||||
|
gtk = {
|
||||||
|
enable = true;
|
||||||
|
theme = {
|
||||||
|
name = "catppuccin-mocha-standard-blue-dark";
|
||||||
|
package = pkgs.catppuccin-gtk.override {
|
||||||
|
accents = [ "blue" ];
|
||||||
|
size = "standard";
|
||||||
|
variant = "mocha";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
iconTheme = {
|
||||||
|
name = "Papirus-Dark";
|
||||||
|
package = pkgs.catppuccin-papirus-folders.override {
|
||||||
|
flavor = "mocha";
|
||||||
|
accent = "blue";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
cursorTheme = {
|
||||||
|
name = "catppuccin-mocha-lavender-cursors";
|
||||||
|
package = pkgs.catppuccin-cursors.mochaLavender;
|
||||||
|
};
|
||||||
|
gtk3 = {
|
||||||
|
extraConfig.gtk-application-prefer-dark-theme = super-config.darkMode == true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
dconf.settings = {
|
||||||
|
"org/gtk/settings/file-chooser" = {
|
||||||
|
sort-directories-first = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# GTK4 Setup
|
||||||
|
"org/gnome/desktop/interface" = {
|
||||||
|
gtk-theme = "catppuccin-mocha-standard-blue-dark";
|
||||||
|
color-scheme = lib.mkIf (super-config.darkMode == true) "prefer-dark";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
xdg.configFile = {
|
||||||
|
kvantum = {
|
||||||
|
target = "Kvantum/kvantum.kvconfig";
|
||||||
|
text = lib.generators.toINI { } {
|
||||||
|
General.theme = "catppuccin-mocha-blue";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
qt5ct = {
|
||||||
|
target = "qt5ct/qt5ct.conf";
|
||||||
|
text = lib.generators.toINI { } {
|
||||||
|
Appearance = {
|
||||||
|
icon_theme = "Papirus-Dark";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
qt6ct = {
|
||||||
|
target = "qt6ct/qt6ct.conf";
|
||||||
|
text = lib.generators.toINI { } {
|
||||||
|
Appearance = {
|
||||||
|
icon_theme = "Papirus-Dark";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
qt = {
|
||||||
|
enable = true;
|
||||||
|
platformTheme = "qtct";
|
||||||
|
style = {
|
||||||
|
name = "kvantum";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.user.sessionVariables = {
|
||||||
|
QT_STYLE_OVERRIDE = "kvantum";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -9,6 +9,8 @@
|
||||||
enableHypridle = true;
|
enableHypridle = true;
|
||||||
has_battery = false;
|
has_battery = false;
|
||||||
|
|
||||||
|
networking.hostName = "desktop";
|
||||||
|
|
||||||
extraOutputConfig = {
|
extraOutputConfig = {
|
||||||
"HDMI-A-3" = {pos = "0 0";};
|
"HDMI-A-3" = {pos = "0 0";};
|
||||||
"HDMI-A-1" = { pos = "1920 0"; };
|
"HDMI-A-1" = { pos = "1920 0"; };
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
has_battery = true;
|
has_battery = true;
|
||||||
|
darkMode = true;
|
||||||
useThermald = true;
|
useThermald = true;
|
||||||
desktop_scale = 1.3;
|
desktop_scale = 1.3;
|
||||||
|
|
||||||
|
|
@ -14,6 +15,8 @@
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
networking.hostName = "laptop";
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue