diff --git a/flake.lock b/flake.lock index 6d0b147..a9a1bbd 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,119 @@ { "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-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": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", + "repo": "base16-vim", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -16,6 +130,22 @@ "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" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -70,6 +200,39 @@ "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": [ @@ -91,6 +254,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "libgit2": { "flake": false, "locked": { @@ -212,6 +396,22 @@ } }, "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" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1695644571, "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", @@ -265,12 +465,41 @@ "nix": "nix", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", + "stylix": "stylix", "wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit" } }, + "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": 1716037261, + "narHash": "sha256-eF0A36GdegKkEiwFArjCysGU/XEYvzj7x5jfkFMtmqM=", + "owner": "danth", + "repo": "stylix", + "rev": "76e7daf5a16d442ac98e844582f7dc1354610886", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1704649711, diff --git a/flake.nix b/flake.nix index 983010d..bc2852d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + stylix.url = "github:danth/stylix"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -63,10 +64,12 @@ loki = lib.nixosSystem { modules = [ nixos-hardware.nixosModules.dell-xps-13-9310 + inputs.stylix.nixosModules.stylix ./hosts/loki ]; specialArgs = { inherit inputs outputs; }; }; + pocket2 = lib.nixosSystem { modules = [ ./hosts/pocket2 ]; specialArgs = { inherit inputs outputs; }; diff --git a/home/common/btop.nix b/home/common/btop.nix index 1449b3b..b63d0a8 100644 --- a/home/common/btop.nix +++ b/home/common/btop.nix @@ -4,8 +4,6 @@ programs.btop = { enable = true; settings = { - color_theme = "dracula"; - theme_background = true; proc_gradient = false; }; }; diff --git a/home/gui/alacritty.nix b/home/gui/alacritty.nix index bab1715..186a333 100644 --- a/home/gui/alacritty.nix +++ b/home/gui/alacritty.nix @@ -3,27 +3,7 @@ programs.alacritty = { enable = true; settings = { - window.opacity = 0.8; decorations_theme_variant = "dark"; - font = { - normal = { - family = "monospace"; - style = "Regular"; - }; - bold = { - family = "monospace"; - style = "Bold"; - }; - italic = { - family = "monospace"; - style = "Italic"; - }; - bold_italic = { - family = "monospace"; - style = "Bold Italic"; - }; - size = 9.0; - }; bell = { animation = "EaseOutExpo"; duration = 500; diff --git a/home/gui/fuzzel.nix b/home/gui/fuzzel.nix index afbb41c..89dce3a 100644 --- a/home/gui/fuzzel.nix +++ b/home/gui/fuzzel.nix @@ -7,16 +7,11 @@ main = { icon-theme = "Papirus-Dark"; width = 50; - font = "Ubuntu:style=Bold:size=12, Hack:weight=bold:size=12"; + # font = "Ubuntu:style=Bold:size=12, Hack:weight=bold:size=12"; fields = "name,generic,comment,categories,filename,keywords"; prompt = "❯ "; layer = "overlay"; }; - colors = { - background = "282a36fa"; - selection = "3d4474fa"; - border = "fffffffa"; - }; border = { radius = 20; }; diff --git a/home/gui/terminals.nix b/home/gui/terminals.nix index aadda53..4621830 100644 --- a/home/gui/terminals.nix +++ b/home/gui/terminals.nix @@ -2,17 +2,11 @@ { programs.kitty = { enable = true; - font = { - #name = "Terminus"; - name = "Fira Code"; - size = 10; - }; - theme = "Dracula"; settings = { mouse_hide_wait = "3.0"; url_style = "double"; copy_on_select = "no"; - background_opacity = "0.75"; + # background_opacity = "0.75"; scrollback_lines = 4000; scrollback_pager_history_size = 2048; }; @@ -24,8 +18,6 @@ }; settings = { main = { - font = "Source Code Pro:size=9"; - dpi-aware = "yes"; term = "tmux-256color"; }; mouse = { @@ -34,9 +26,6 @@ bell = { urgent = "yes"; }; - colors = { - alpha = "0.75"; - }; }; }; } diff --git a/hosts/feed-me.png b/hosts/feed-me.png new file mode 100644 index 0000000..21f1840 Binary files /dev/null and b/hosts/feed-me.png differ diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix index d02aa12..1e7855f 100644 --- a/hosts/loki/default.nix +++ b/hosts/loki/default.nix @@ -7,6 +7,7 @@ ../workstation ../workstation/kvm.nix ../wm + ../themes.nix ]; networking.hostName = "loki"; } diff --git a/hosts/themes.nix b/hosts/themes.nix new file mode 100644 index 0000000..a0ee15e --- /dev/null +++ b/hosts/themes.nix @@ -0,0 +1,22 @@ + stylix = { + base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; + image = ./feed-me.png; + fonts = { + # monospace = { + # package = pkgs.nerdfonts.override {fonts = ["Source Code Pro"];}; + # # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; + # }; + sizes = { + applications = 12; + terminal = 9; + desktop = 12; + popups = 10; + }; + }; + opacity = { + applications = 1.0; + terminal = 0.75; + desktop = 1.0; + popups = 1.0; + }; + }; diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index 7120193..c04752a 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -75,7 +75,6 @@ in }; plymouth = { enable = true; - theme = "breeze"; }; kernel = { sysctl = { "vm.swappiness" = 10;};