Compare commits

...

7 commits

Author SHA1 Message Date
cc7aa76671
♻ refactor(appearance): Move GTK & Qt to their own folder
Also set the pointerCursor.
2024-11-03 13:20:01 -08:00
bfc3156a1d
feat(qt): Configure qt 2024-11-03 13:20:01 -08:00
cb800549e8
feat(gtk): Configure GTK 2024-11-03 13:20:01 -08:00
1039161172
feat(dunst): Install dunst 2024-11-03 13:20:01 -08:00
3f09b1c787
🔥 refactor(nixgl): Comment out nixGL 2024-11-03 13:20:00 -08:00
c221e8d432
feat(cb): Install Clipboard & remove copyq 2024-11-03 13:20:00 -08:00
bbfa57c6ab
🚚 refactor(home): Reorganize modules
Instead of having separate folders for each program with a default.nix
inside, moved modules into programs/services/xorg respectively. Xdg was
moved to the root home folder as it makes the most sense there.
2024-11-03 13:20:00 -08:00
35 changed files with 229 additions and 86 deletions

View file

@ -1,20 +1,5 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -35,41 +20,7 @@
"type": "github"
}
},
"nixgl": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1713543440,
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
"owner": "nix-community",
"repo": "nixGL",
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixGL",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1660551188,
"narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
@ -88,10 +39,10 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"nixgl": "nixgl",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"rose-pine": "rose-pine",
"rose-pine-amfora": "rose-pine-amfora"
"rose-pine-amfora": "rose-pine-amfora",
"rose-pine-qt5ct": "rose-pine-qt5ct"
}
},
"rose-pine": {
@ -124,6 +75,22 @@
"repo": "amfora",
"type": "github"
}
},
"rose-pine-qt5ct": {
"flake": false,
"locked": {
"lastModified": 1681348150,
"narHash": "sha256-mfkVexp3deDZCwbq/P8Ynf1gYwF5kVXfGGv7BEGFZCU=",
"owner": "piperbly",
"repo": "rose-pine-qt5ct",
"rev": "61c90bc63291508f2cec6e8589e35af637a75374",
"type": "github"
},
"original": {
"owner": "piperbly",
"repo": "rose-pine-qt5ct",
"type": "github"
}
}
},
"root": "root",

View file

@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixgl.url = "github:nix-community/nixGL";
# nixgl.url = "github:nix-community/nixGL";
rose-pine.url = "git+https://git.punkfairie.net/punkfairie/rose-pine-nix";
@ -18,6 +18,10 @@
url = "github:rose-pine/amfora";
flake = false;
};
rose-pine-qt5ct = {
url = "github:piperbly/rose-pine-qt5ct";
flake = false;
};
};
outputs =
@ -35,10 +39,11 @@
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = with inputs; {
inherit nixgl;
inherit inputs;
};
extraSpecialArgs = # with inputs;
{
# inherit nixgl;
inherit inputs;
};
modules = [
./home

View file

@ -0,0 +1,9 @@
{ ... }:
{
rose-pine.pointerCursor = true;
imports = [
./gtk.nix
./qt.nix
];
}

13
home/appearance/gtk.nix Normal file
View file

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
gtk = {
enable = true;
rose-pine.enable = true;
iconTheme = {
package = pkgs.kora-icon-theme;
name = "kora";
};
};
}

10
home/appearance/qt.nix Normal file
View file

@ -0,0 +1,10 @@
{ inputs, ... }:
{
xdg.configFile."qt5ct/colors/rose-pine.conf".source = "${inputs.rose-pine-qt5ct}/rose-pine.conf";
qt = {
enable = true;
style.name = "adwaita";
};
}

View file

@ -1,6 +1,6 @@
{
pkgs,
nixgl,
# nixgl,
...
}:
{
@ -10,9 +10,9 @@
targets.genericLinux.enable = true;
# GPU integration.
nixGL.packages = nixgl.packages;
nixGL.defaultWrapper = "nvidia";
nixGL.installScripts = [ "nvidia" ];
# nixGL.packages = nixgl.packages;
# nixGL.defaultWrapper = "nvidia";
# nixGL.installScripts = [ "nvidia" ];
home.language.base = "en_US.UTF-8";
@ -45,30 +45,11 @@
fonts.fontconfig.defaultFonts.monospace = [ "Maple Mono NF" ];
imports = [
./amfora
./bat
./btop
./cava
./curl
./eza
./fish
./gh
./hyfetch
./lazygit
./less
./man
./ncmpcpp
./neofetch
./starship
./syncthing
./tmux
./topgrade
./wget
./wezterm
./xdg
./xsession
./zathura
./zoxide
./appearance
./programs
./services
./xdg.nix
./xorg
];
# This value determines the Home Manager release that your configuration is

26
home/programs/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ ... }:
{
imports = [
./amfora.nix
./bat.nix
./btop.nix
./cava.nix
./curl.nix
./eza.nix
./fish.nix
./gh.nix
./hyfetch.nix
./lazygit.nix
./less.nix
./man.nix
./ncmpcpp.nix
./neofetch.nix
./starship.nix
./tmux.nix
./topgrade.nix
./wget.nix
./wezterm.nix
./zathura.nix
./zoxide.nix
];
}

View file

@ -0,0 +1,10 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
clipboard-jh
];
home.sessionVariables = {
CLIPBOARD_THEME = "ansi";
};
}

View file

@ -0,0 +1,8 @@
{ ... }:
{
imports = [
./clipboard.nix
./dunst.nix
./syncthing.nix
];
}

109
home/services/dunst.nix Normal file
View file

@ -0,0 +1,109 @@
{
pkgs,
config,
lib,
...
}:
{
services.dunst = {
enable = true;
# I don't want to use the rose-pine icons; also don't want to deal with the
# drop-in weirdness.
rose-pine.enable = false;
iconTheme = {
package = pkgs.kora-icon-theme;
name = "Kora";
};
settings = lib.mkMerge [
### Rose Pine ###
# TODO: Set this conditionally based on current theme.
{
global = {
width = 400;
offset = "5x5";
progress_bar_min_width = 380;
progress_bar_max_width = 380;
progress_bar_corner_radius = 2;
padding = 10;
horizontal_padding = 10;
frame_width = 1;
gap_size = 3;
corner_radius = 2;
background = "#26233a";
foreground = "#e0def4";
};
urgency_low = {
background = "#26273d";
highlight = "#31748f";
frame_color = "#31748f";
default_icon = "dialog-information";
format = "<b><span foreground='#31748f'>%s</span></b>\\n%b";
};
urgency_normal = {
background = "#362e3c";
highlight = "#f6c177";
frame_color = "#f6c177";
default_icon = "dialog-warning";
format = "<b><span foreground='#f6c177'>%s</span></b>\\n%b";
};
urgency_critical = {
background = "#35263d";
highlight = "#eb6f92";
frame_color = "#eb6f92";
default_icon = "dialog-error";
format = "<b><span foreground='#eb6f92'>%s</span></b>\\n%b";
};
}
### Custom ###
{
global = {
monitor = 0;
sort = "yes";
idle_threshold = 120;
font = (builtins.head config.fonts.fontconfig.defaultFonts.monospace) + " 10";
markup = "full";
show_age_threshold = 60;
word_wrap = "yes";
ignore_newline = "no";
stack_duplicates = true;
hide_duplicate_count = false;
show_indicators = "yes";
sticky_history = "yes";
history_length = 20;
browser = "/usr/bin/zen-browser --new-tab";
always_run_script = true;
title = "Dunst";
class = "Dunst";
mouse_left_click = "do_action";
mouse_middle_click = "close_current";
mouse_right_click = "close_all";
};
signed_on = {
appname = "Pidgin";
summary = "*signed on*";
urgency = "low";
};
signed_off = {
appname = "Pidgin";
summary = "*signed off*";
urgency = "low";
};
says = {
appname = "Pidgin";
summary = "*says*";
urgency = "critical";
};
}
];
};
}

6
home/xorg/default.nix Normal file
View file

@ -0,0 +1,6 @@
{ ... }:
{
imports = [
./xsession.nix
];
}

View file

@ -11,7 +11,6 @@
''
sudo mount -a
"$HOME/.config/xrandr/desktop.sh"
copyq &
mpd &
pidgin &
'';