xun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mainly styling things

Browse source
This commit is contained in:
xunuwu 2024-10-30 09:13:46 +01:00
parent 06397e1f66
commit 48f90b854a
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
16 changed files with 379 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

268
flake.lock generated
View file

@ -1,5 +1,71 @@
{ {
"nodes": { "nodes": {
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1708890466,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"type": "github"
}
},
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1725860795,
"narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -80,6 +146,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -216,6 +298,43 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
@ -268,6 +387,23 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
},
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1729742320, "lastModified": 1729742320,
@ -346,6 +482,27 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"microvm": { "microvm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -507,6 +664,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1730021733, "lastModified": 1730021733,
@ -560,6 +733,7 @@
"small-nvim": "small-nvim", "small-nvim": "small-nvim",
"sobercookie": "sobercookie", "sobercookie": "sobercookie",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix",
"umu": "umu", "umu": "umu",
"vpn-confinement": "vpn-confinement" "vpn-confinement": "vpn-confinement"
} }
@ -643,6 +817,36 @@
"url": "https://spectrum-os.org/git/spectrum" "url": "https://spectrum-os.org/git/spectrum"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_5",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3",
"systems": "systems_6",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1729963473,
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
"owner": "danth",
"repo": "stylix",
"rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -718,6 +922,70 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1716423189,
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-tmux",
"type": "github"
}
},
"umu": { "umu": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

1
flake.nix
View file

@ -56,6 +56,7 @@
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
small-nvim.url = "github:xunuwu/small-nvim"; small-nvim.url = "github:xunuwu/small-nvim";
# small-nvim.url = "/home/xun/dots/small-nvim"; # small-nvim.url = "/home/xun/dots/small-nvim";
stylix.url = "github:danth/stylix";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.url = "github:Mic92/nix-index-database";

71
home-modules/xun/desktop/colorscheme/default.nix
View file

@ -1,71 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
cfg = config.xun.desktop;
dark = {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
theme = {
package = pkgs.gnome-themes-extra;
name = "Adwaita-dark";
};
iconTheme = {
package = pkgs.adwaita-icon-theme;
name = "Adwaita-dark";
};
gtk2.extraConfig = "gtk-application-prefer-dark-theme=1";
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
};
qt = {
platformTheme.name = "gtk3";
style = {
name = "Adwaita-dark";
package = pkgs.adwaita-qt;
};
};
};
light = {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
gtk = {
theme = {
package = pkgs.gnome-themes-extra;
name = "Adwaita";
};
iconTheme = {
package = pkgs.adwaita-icon-theme;
name = "Adwaita";
};
gtk2.extraConfig = "gtk-application-prefer-dark-theme=false";
gtk3.extraConfig.gtk-application-prefer-dark-theme = 0;
gtk4.extraConfig.gtk-application-prefer-dark-theme = 0;
};
qt = {
style = {
name = "adwaita";
package = pkgs.adwaita-qt;
};
};
};
in {
options.xun.desktop.colorscheme = lib.mkOption {
default = null;
type = lib.types.enum [null "dark" "light"]; # might add more in the future
};
config = lib.mkIf (cfg.colorscheme != null) (lib.mkMerge [
(lib.mkIf (cfg.colorscheme == "dark") dark)
(lib.mkIf (cfg.colorscheme == "light") light)
]);
# config = lib.mkIf (cfg.colorscheme != null) (let
# switch = {
# dark = {};
# light = {};
# };
# in
# switch."${toString cfg.colorscheme}");
}

56
home-modules/xun/desktop/default.nix
View file

@ -6,50 +6,32 @@
}: let }: let
cfg = config.xun.desktop; cfg = config.xun.desktop;
in { in {
imports = [
./colorscheme
];
options.xun.desktop = { options.xun.desktop = {
xdg.enable = lib.mkEnableOption "xdg env vars"; xdg.enable = lib.mkEnableOption "xdg env vars";
# colorscheme = lib.mkOption {
# default = null;
# type = lib.types.enum ["dark" "light"];
# };
}; };
config = lib.mkMerge [ config = lib.mkIf cfg.xdg.enable {
# (let xdg = let
# switch = { home = config.home.homeDirectory;
# "dark" = {}; in {
# "light" = {}; enable = true;
# }; cacheHome = config.home.homeDirectory + "/.local/cache";
# in
# switch."${toString cfg.colorscheme}")
(lib.mkIf cfg.xdg.enable { userDirs = {
xdg = let
home = config.home.homeDirectory;
in {
enable = true; enable = true;
cacheHome = config.home.homeDirectory + "/.local/cache"; desktop = home + "/desktop";
documents = home + "/docs";
userDirs = { download = home + "/down";
enable = true; music = home + "/music";
desktop = home + "/desktop"; pictures = home + "/pics";
documents = home + "/docs"; publicShare = home + "/share";
download = home + "/down"; videos = home + "/vids";
music = home + "/music"; extraConfig = {
pictures = home + "/pics"; XDG_SCREENSHOTS_DIR = config.xdg.userDirs.pictures + "/screenshots";
publicShare = home + "/share";
videos = home + "/vids";
extraConfig = {
XDG_SCREENSHOTS_DIR = config.xdg.userDirs.pictures + "/screenshots";
};
}; };
}; };
};
home.packages = [pkgs.xdg-utils]; home.packages = [pkgs.xdg-utils];
}) };
];
} }

19
home/profiles/nixdesk/dark.nix Normal file
View file

@ -0,0 +1,19 @@
{
lib,
pkgs,
...
}: {
stylix.targets = {
firefox.profileNames = ["xun"];
};
gtk = {
# theme = lib.mkForce {
# package = pkgs.whitesur-gtk-theme;
# name = "WhiteSur-Dark";
# };
iconTheme = {
name = "WhiteSur-dark";
package = pkgs.whitesur-icon-theme;
};
};
}

17
home/profiles/nixdesk/default.nix
View file

@ -1,6 +1,7 @@
{ {
inputs, inputs,
self, self,
pkgs,
... ...
}: { }: {
imports = [ imports = [
@ -28,7 +29,7 @@
# desktop # desktop
../../programs/desktop ../../programs/desktop
../../programs/desktop/theme.nix # ../../programs/desktop/theme.nix
../../programs/desktop/awesome ../../programs/desktop/awesome
#../../programs/desktop/hyprland #../../programs/desktop/hyprland
../../programs/desktop/sway ../../programs/desktop/sway
@ -63,6 +64,8 @@
# ../../programs/games/krunker.nix # ../../programs/games/krunker.nix
#../../programs/games/ludusavi.nix #../../programs/games/ludusavi.nix
./dark.nix
# media services # media services
../../services/media/playerctl.nix ../../services/media/playerctl.nix
# system services # system services
@ -81,7 +84,6 @@
}; };
desktop = { desktop = {
xdg = enabled; xdg = enabled;
colorscheme = "light";
}; };
programs.terminal = { programs.terminal = {
shell.zsh = enabled; shell.zsh = enabled;
@ -106,4 +108,15 @@
}; };
# school.geogebra = enabled; # school.geogebra = enabled;
}; };
qt = {
enable = true;
platformTheme = {
name = "gtk3";
package = [
pkgs.libsForQt5.qtstyleplugins
pkgs.qt6.qtbase
];
};
};
} }

13
home/programs/browsers/firefox/default.nix
View file

@ -31,7 +31,8 @@
profiles.xun = { profiles.xun = {
extensions = with config.nur.repos.rycee.firefox-addons; [ extensions = with config.nur.repos.rycee.firefox-addons; [
ublock-origin ublock-origin
(lib.mkIf (config.xun.desktop.colorscheme == "dark") darkreader) # (lib.mkIf (config.xun.desktop.colorscheme == "dark") darkreader)
darkreader
sponsorblock sponsorblock
tridactyl tridactyl
translate-web-pages translate-web-pages
@ -61,16 +62,6 @@
# else null # else null
# }\", true);"; # }\", true);";
settings = { settings = {
"extensions.activeThemeID" = let
inherit (config.xun.desktop) colorscheme;
in
lib.mkIf (colorscheme != null) (
if colorscheme == "dark"
then "{30756de5-da3b-43c4-8b35-1db7bb01680a}"
else if colorscheme == "light"
then "firefox-compact-light@mozilla.org"
else null
);
"browser.display.use_system_colors" = true; # about:blank colour match colourscheme "browser.display.use_system_colors" = true; # about:blank colour match colourscheme
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # enable userChrome "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # enable userChrome
"browser.tabs.inTitleBar" = "0"; # use system title bar "browser.tabs.inTitleBar" = "0"; # use system title bar

2
home/programs/desktop/common/fuzzel.nix
View file

@ -32,7 +32,7 @@ in {
terminal = "${lib.getExe pkgs.foot}"; terminal = "${lib.getExe pkgs.foot}";
layer = "overlay"; layer = "overlay";
}; };
colors = colors."${config.xun.desktop.colorscheme}"; # colors = colors."${config.xun.desktop.colorscheme}";
}; };
}; };
} }

6
home/programs/desktop/sway/default.nix
View file

@ -53,9 +53,9 @@
''; '';
config = { config = {
modifier = "Mod4"; modifier = "Mod4";
output = { # output = {
"*".bg = "${config.xdg.userDirs.pictures}/wallpaper fill"; # "*".bg = "${config.xdg.userDirs.pictures}/wallpaper fill";
}; # };
input = { input = {
"*".xkb_layout = osConfig.services.xserver.xkb.layout; "*".xkb_layout = osConfig.services.xserver.xkb.layout;
}; };

4
home/programs/desktop/sway/waybar.nix
View file

@ -42,10 +42,6 @@
padding: 0 5px; padding: 0 5px;
} }
#workspaces button.visible {
box-shadow: inset 0 -3px black;
}
#workspaces button.urgent { #workspaces button.urgent {
box-shadow: inset 0 -3px blue; box-shadow: inset 0 -3px blue;
} }

4
home/terminal/emulator/foot.nix
View file

@ -3,8 +3,8 @@
enable = true; enable = true;
settings = { settings = {
main = { main = {
include = "${pkgs.foot.themes}/share/foot/themes/modus-operandi"; # include = "${pkgs.foot.themes}/share/foot/themes/modus-operandi";
font = "monospace:size=9"; # font = "monospace:size=9";
}; };
mouse.hide-when-typing = true; mouse.hide-when-typing = true;
}; };

12
hosts/machines/default.nix
View file

@ -63,6 +63,8 @@ in {
imports = lib.flatten [ imports = lib.flatten [
./nixdesk ./nixdesk
inputs.stylix.nixosModules.stylix
(with systemProfiles; [ (with systemProfiles; [
secrets.default secrets.default
secrets.nixdesk.default secrets.nixdesk.default
@ -92,8 +94,13 @@ in {
desktop.sway desktop.sway
#..desktop.hyprland #..desktop.hyprland
programs.default programs.dconf
programs.fonts
programs.home-manager
# programs.qt
programs.adb
programs.tools programs.tools
programs.thunar
services.default services.default
services.pipewire services.pipewire
@ -106,6 +113,8 @@ in {
#services.ollama #services.ollama
desktop.x11.nosleep desktop.x11.nosleep
themes.dark
# programs.gamemode # TEMP: TODO # programs.gamemode # TEMP: TODO
# programs.gamescope # TEMP: TODO # programs.gamescope # TEMP: TODO
# programs.steam # TEMP: TODO # programs.steam # TEMP: TODO
@ -114,6 +123,7 @@ in {
{ {
home-manager = { home-manager = {
backupFileExtension = "hm-backup";
users.xun.imports = homeImports."xun@nixdesk"; users.xun.imports = homeImports."xun@nixdesk";
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
}; };

6
systemProfiles/programs/dconf.nix Normal file
View file

@ -0,0 +1,6 @@
{
programs = {
# make HM-managed GTK stuff work
dconf.enable = true;
};
}

17
systemProfiles/programs/default.nix
View file

@ -1,17 +0,0 @@
{
self,
super,
root,
}: {
imports = with super; [
fonts
home-manager
qt
adb
];
programs = {
# make HM-managed GTK stuff work
dconf.enable = true;
};
}

9
systemProfiles/programs/thunar.nix Normal file
View file

@ -0,0 +1,9 @@
_: {pkgs, ...}: {
services.tumbler.enable = true; # image thumbnails
programs.thunar = {
enable = true;
plugins = with pkgs.xfce; [
thunar-archive-plugin
];
};
}

23
systemProfiles/themes/dark.nix Normal file
View file

@ -0,0 +1,23 @@
_: {pkgs, ...}: {
stylix = {
enable = true;
autoEnable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/da-one-black.yaml";
image = pkgs.fetchurl {
url = "https://i.imgur.com/j9xld8Y.png";
hash = "sha256-ou7+S4QFC7Gabbwv9PKcQLLT/1J26FJM7qRVbjLUoRU=";
};
polarity = "dark";
cursor = {
package = pkgs.whitesur-cursors;
name = "whitesur-cursors";
size = 16;
};
fonts = {
sizes = {
terminal = 9;
applications = 10;
};
};
};
}