caem/nixos-system-config
caem/nixos-system-config
1
Fork 0
Code Releases Activity

Migrate away from stylix and gruvbox

Browse source
This commit is contained in:
caem 2024-06-23 14:40:05 +02:00
parent 1284acef2f
commit 4d2c712bb7
Signed by: caem
GPG key ID: 69A830D03203405F
11 changed files with 127 additions and 382 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

231
flake.lock
View file

@ -39,120 +39,6 @@
"type": "github"
}
},
"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-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"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": false,
"locked": {
@ -169,55 +55,6 @@
"type": "github"
}
},
"flake-compat_2": {
"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"
}
},
"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"
}
},
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -238,27 +75,6 @@
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715930644,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1719091691,
@ -306,22 +122,6 @@
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1719130969,
@ -344,36 +144,7 @@
"home-manager": "home-manager",
"impermanence": "impermanence",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"stylix": "stylix"
}
},
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_2",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1718971834,
"narHash": "sha256-k+BjPJgjmG+u8VwyzjA6YxkoBn9tP1m19h0CQGc3iGM=",
"owner": "danth",
"repo": "stylix",
"rev": "97dcf3c216fe5fb19c406e39f265d3bc9b851377",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"type": "github"
"nur": "nur"
}
}
},

4
flake.nix
View file

@ -15,11 +15,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
stylix.url = "github:danth/stylix";
ags.url = "github:Aylur/ags";
};
outputs = { nixpkgs, impermanence, home-manager, aagl, nur, stylix, ags, ... }:
outputs = { nixpkgs, impermanence, home-manager, aagl, nur, ags, ... }:
{
nixosConfigurations.workstation = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -32,7 +31,6 @@
}
impermanence.nixosModules.impermanence
nur.nixosModules.nur
stylix.nixosModules.stylix
aagl.nixosModules.default
./machines/workstation/configuration.nix

2
machines/workstation/configuration.nix
View file

@ -22,7 +22,7 @@
networking = {
hostName = "workstation";
enableIPv6 = false;
nameservers = [ "1.1.1.1" ];
nameservers = [ "9.9.9.9" ];
defaultGateway = "192.168.2.1";
interfaces.enp34s0.ipv4.addresses = [{
address = "192.168.2.68";

1
users/hu/packages/firefox.nix
View file

@ -1,7 +1,6 @@
{ config, pkgs, ... }:
{
stylix.targets.firefox.enable = false;
programs.firefox = {
enable = true;
package = pkgs.firefox-esr;

7
users/hu/packages/foot.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ ... }:
{
programs.foot = {
@ -6,6 +6,7 @@
settings = {
main = {
pad = "8x8 center";
font = "Go Mono Nerd Font:size=12";
};
mouse = {
@ -15,6 +16,10 @@
scrollback = {
lines = 10000;
};
colors = {
alpha = 0.9;
};
};
};
}

23
users/hu/packages/gtk.nix
View file

@ -1,16 +1,29 @@
{ pkgs, ... }:
{
stylix.targets.gtk.enable = false;
home.pointerCursor = {
gtk.enable = true;
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 24;
};
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
};
gtk = {
enable = true;
theme = {
name = "Gruvbox-Dark-BL-LB";
package = pkgs.gruvbox-gtk-theme;
name = "adw-gtk3-dark";
package = pkgs.adw-gtk3;
};
iconTheme = {
name = "elementary";
package = pkgs.pantheon.elementary-icon-theme;
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
};
};
}

42
users/hu/packages/hyprland.nix
View file

@ -1,10 +1,27 @@
{ ... }:
{
wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.systemd.enable = true;
wayland.windowManager.hyprland.systemd.variables = ["--all"];
wayland.windowManager.hyprland.settings = {
services.hyprpaper = {
enable = true;
settings = {
ipc = "on";
splash = false;
preload = [
"/nix/config/assets/wallpaper.jpg"
];
wallpaper = [
",/nix/config/assets/wallpaper.jpg"
];
};
};
wayland.windowManager.hyprland = {
enable = true;
systemd = {
enable = true;
variables = [ "--all" ];
};
settings = {
"$mod" = "SUPER";
"$terminal" = "foot";
"$menu" = "rofi -show drun";
@ -12,7 +29,7 @@
monitor = "DP-1,1920x1080@144,auto,1";
input = {
kb_layout = "gb:altgr-intl";
kb_layout = "gb:intl";
follow_mouse = 1;
};
@ -22,6 +39,8 @@
border_size = 1;
layout = "master";
allow_tearing = true;
"col.inactive_border" = "rgb(242424)";
"col.active_border" = "rgb(3584E4)";
};
master = {
@ -85,19 +104,6 @@
"ags"
];
};
services.hyprpaper = {
enable = true;
settings = {
ipc = "off";
splash = false;
preload = [
"/nix/config/assets/wallpaper.png"
];
wallpaper = [
",/nix/config/assets/wallpaper.png"
];
};
};
}

8
users/hu/packages/qt.nix
View file

@ -1,10 +1,10 @@
{ pkgs, ... }:
{ ... }:
{
qt = {
enable = true;
style = {
};
platformTheme = "gnome";
style = "adwaita-dark";
};
}

5
users/hu/packages/rofi.nix
View file

@ -1,10 +1,9 @@
{ config, pkgs, stylix, ... }:
{ pkgs, ... }:
{
stylix.targets.rofi.enable = false;
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
theme = "gruvbox-dark-hard";
theme = "sidebar";
};
}

40
users/hu/packages/stylix.nix
View file

@ -1,40 +0,0 @@
{ pkgs, ... }:
{
stylix = {
image = ../../../assets/wallpaper.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
fonts = {
monospace = {
package = pkgs.nerdfonts;
name = "Go Mono Nerd Font";
};
};
fonts = {
sizes = {
terminal = 13;
popups = 13;
applications = 10;
};
};
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
};
targets = {
grub.enable = false;
gtk.enable = false;
};
opacity = {
terminal = 0.9;
popups = 0.9;
};
};
}

6
users/hu/user.nix
View file

@ -5,15 +5,12 @@
../../packages/sets/communication.nix
../../packages/sets/games.nix
./persist.nix
./packages/stylix.nix
./packages/nh.nix
./packages/zsh/zsh.nix
];
environment.variables = {
# home.sessionVariables didn't work here for some reason
ZDOTDIR = "/home/hu/.config/zsh";
EDITOR = "nvim";
};
@ -24,8 +21,6 @@
hashedPasswordFile = "/nix/config/secrets/hu/pass";
};
# TODO: Figure out a way to run scripts with the user session as a systemd service
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
@ -38,7 +33,6 @@
./packages/zsh/zsh-home.nix
./packages/git.nix
./packages/gtk.nix
# ./packages/tmux.nix
./packages/hyprland.nix
./packages/foot.nix
./packages/firefox.nix