remove stylix, add hyprland, some misc changes as well
This commit is contained in:
Pyrox
parent
312f37adc0
commit
37d8d13a10
GPG key ID:
8CDF3F7CAA53A0F5
20 changed files with 287 additions and 404 deletions
180
flake.lock
180
flake.lock
|
|
@ -42,27 +42,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1658847131,
|
||||
"narHash": "sha256-X6Mml7cT0YR3WCD5fkUhpRVV5ZPcwdcDsND8r8xMqTE=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "6b404cda2e04ca3cf5ca7b877af9c469e1386acb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"blobs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -100,28 +79,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"coricamu": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1659649195,
|
||||
"narHash": "sha256-wRpMO4Mm4uizR5M71iipdi8ssSYMEPPAIwWyFYnhnco=",
|
||||
"owner": "danth",
|
||||
"repo": "coricamu",
|
||||
"rev": "cdd2f7326efd91509caf84e69b669a7f9e6782bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"repo": "coricamu",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
|
|
@ -358,22 +315,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_9": {
|
||||
"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": "nixpkgs-lib"
|
||||
|
|
@ -637,28 +578,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1658924727,
|
||||
"narHash": "sha256-Fhh9FK9CvuCLxG1WkWJPoendDeXKI4gHYTfezo1n2Zg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0e2f7876d2f2ae98a67d89a8bef8c49332aae5af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lanzaboote": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
|
|
@ -795,7 +714,7 @@
|
|||
"nix-eval-jobs": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675041725,
|
||||
|
|
@ -959,21 +878,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1673315479,
|
||||
"narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1675763311,
|
||||
"narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=",
|
||||
|
|
@ -989,7 +893,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1675040521,
|
||||
"narHash": "sha256-+YhT+lQT95qHcj5SNXdRFqIV/SvAezT90T8GzqQ94lE=",
|
||||
|
|
@ -1005,7 +909,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1675115703,
|
||||
"narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=",
|
||||
|
|
@ -1131,18 +1035,17 @@
|
|||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1659102345,
|
||||
"narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
|
||||
"lastModified": 1673315479,
|
||||
"narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
|
||||
"rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
|
|
@ -1205,7 +1108,6 @@
|
|||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs-update": "nixpkgs-update",
|
||||
"nur": "nur",
|
||||
"stylix": "stylix",
|
||||
"tclip": "tclip",
|
||||
"vscode-extensions": "vscode-extensions",
|
||||
"wayland": "wayland"
|
||||
|
|
@ -1269,33 +1171,11 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stylix": {
|
||||
"inputs": {
|
||||
"base16": "base16",
|
||||
"coricamu": "coricamu",
|
||||
"flake-compat": "flake-compat_7",
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1677597194,
|
||||
"narHash": "sha256-dYDZv4k8ztRogjJkwibaCvUIyq97exwzHwqvo/DH6ZU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "f93518ec4857358619ab3cb2e7fc97b15f98a7e3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tclip": {
|
||||
"inputs": {
|
||||
"gomod2nix": "gomod2nix",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"utils": "utils_5"
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"utils": "utils_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1677254499,
|
||||
|
|
@ -1342,36 +1222,6 @@
|
|||
}
|
||||
},
|
||||
"utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1642700792,
|
||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_4": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_5": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
|
|
@ -1388,9 +1238,9 @@
|
|||
},
|
||||
"vscode-extensions": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_8",
|
||||
"flake-compat": "flake-compat_7",
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1677634074,
|
||||
|
|
@ -1408,10 +1258,10 @@
|
|||
},
|
||||
"wayland": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_9",
|
||||
"flake-compat": "flake-compat_8",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"nix-eval-jobs": "nix-eval-jobs",
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675160077,
|
||||
|
|
|
|||
21
flake.nix
21
flake.nix
|
|
@ -8,7 +8,7 @@
|
|||
max-jobs = 8;
|
||||
netrc-file = "/home/thehedgehog/.netrc";
|
||||
};
|
||||
description = "The Hedgehog's Nix config with flakes";
|
||||
description = "Pyrox's flaky configurations";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
|
@ -24,13 +24,13 @@
|
|||
golink.url = "github:tailscale/golink";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
lanzaboote.url = "github:nix-community/lanzaboote";
|
||||
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
|
||||
neovim.url = "github:nix-community/neovim-nightly-overlay";
|
||||
neovim.inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836";
|
||||
nixpkgs-update.url = "github:ryantm/nixpkgs-update";
|
||||
nur.url = "github:nix-community/nur";
|
||||
stylix.url = "github:danth/stylix";
|
||||
tclip.url = "github:theHedgehog0/tclip";
|
||||
vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
|
||||
wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||
|
|
@ -48,12 +48,12 @@
|
|||
emacs,
|
||||
golink,
|
||||
home-manager,
|
||||
hyprland,
|
||||
lanzaboote,
|
||||
mailserver,
|
||||
neovim,
|
||||
nixpkgs-update,
|
||||
nur,
|
||||
stylix,
|
||||
tclip,
|
||||
vscode-extensions,
|
||||
wayland,
|
||||
|
|
@ -95,10 +95,7 @@
|
|||
username ? "pyrox",
|
||||
profile ? "desktop",
|
||||
}: {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.${username} = import ./home/profiles/${profile}.nix;
|
||||
home-manager.extraSpecialArgs = {inherit pkgs system inputs;};
|
||||
users.users.${username}.isNormalUser = true;
|
||||
};
|
||||
|
||||
|
|
@ -109,12 +106,19 @@
|
|||
hmProfile ? "desktop",
|
||||
coreCount,
|
||||
extraModules ? [],
|
||||
extraHMModules ? [],
|
||||
}: lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./hosts/${hostname}/configuration.nix
|
||||
./hosts/${hostname}/bootloader.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {inherit pkgs system inputs;};
|
||||
home-manager.sharedModules = [] ++ extraHMModules;
|
||||
}
|
||||
( mkUser { inherit profile; username = "pyrox";})
|
||||
( mkUser { inherit profile; username = "thehedgehog";})
|
||||
] ++ extraModules;
|
||||
|
|
@ -158,7 +162,10 @@
|
|||
profile = "desktop";
|
||||
coreCount = 8;
|
||||
extraModules = [
|
||||
# inputs.stylix.nixosModules.stylix
|
||||
hyprland.nixosModules.default
|
||||
];
|
||||
extraHMModules = [
|
||||
hyprland.homeManagerModules.default
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
13
home/gtk.nix
13
home/gtk.nix
|
|
@ -1,10 +1,21 @@
|
|||
{pkgs, ...}: {
|
||||
{pkgs, config, ...}: {
|
||||
gtk = {
|
||||
enable = true;
|
||||
cursorTheme = {
|
||||
package = pkgs.phinger-cursors;
|
||||
name = "phinger-cursors";
|
||||
};
|
||||
font = {
|
||||
name = "IBM Plex Mono";
|
||||
size = 14;
|
||||
};
|
||||
gtk3.bookmarks = [
|
||||
"file:///${config.home.homeDirectory}/Downloads"
|
||||
];
|
||||
theme = {
|
||||
name = "Catppuccin-Mocha";
|
||||
package = pkgs.catppuccin-gtk;
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.papirus-icon-theme;
|
||||
name = "Papirus-Dark";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
{ inputs, ... }: {
|
||||
imports = [
|
||||
../programs/gpg.nix
|
||||
# inputs.stylix.nixosModules.stylix
|
||||
../theme.nix
|
||||
];
|
||||
programs.home-manager.enable = true;
|
||||
# home.sessionVariables = {
|
||||
# GNUPGHOME = "~/.gnupg";
|
||||
# };
|
||||
home.stateVersion = "23.05";
|
||||
home.language = {base = "en_US.utf8";};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,9 +35,13 @@
|
|||
zotero
|
||||
];
|
||||
xdg.configFile = {
|
||||
"waybar" = {
|
||||
source = ../../oldconfig/waybar;
|
||||
recursive = true;
|
||||
"waybar/style.css" = {
|
||||
source = ../../oldconfig/waybar/style.css;
|
||||
recursive = false;
|
||||
};
|
||||
"waybar/mocha.css" = {
|
||||
source = ../../oldconfig/waybar/mocha.css;
|
||||
recursive = false;
|
||||
};
|
||||
"wlogout" = {
|
||||
source = ../../oldconfig/wlogout;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
../programs/obs.nix
|
||||
# ../programs/rofi.nix
|
||||
../programs/vscodium.nix
|
||||
../programs/waybar.nix
|
||||
../programs/wezterm
|
||||
|
||||
../services/gpg-agent.nix
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
programs.helix = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin_mocha";
|
||||
editor = {
|
||||
line-number = "absolute";
|
||||
mouse = false;
|
||||
|
|
|
|||
|
|
@ -4,49 +4,49 @@
|
|||
}: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
# font.name = "IBM Plex Mono Regular";
|
||||
font.name = "IBM Plex Mono Regular";
|
||||
font.size = 12;
|
||||
# extraConfig = ''
|
||||
# foreground #CDD6F4
|
||||
# background #1E1E2E
|
||||
# selection_foreground #1E1E2E
|
||||
# selection_background #F5E0DC
|
||||
# cursor #F5E0DC
|
||||
# cursor_text_color #1E1E2E
|
||||
# url_color #F5E0DC
|
||||
# active_border_color #B4BEFE
|
||||
# inactive_border_color #6C7086
|
||||
# bell_border_color #F9E2AF
|
||||
# wayland_titlebar_color system
|
||||
# macos_titlebar_color system
|
||||
# active_tab_foreground #11111B
|
||||
# active_tab_background #CBA6F7
|
||||
# inactive_tab_foreground #CDD6F4
|
||||
# inactive_tab_background #181825
|
||||
# tab_bar_background #11111B
|
||||
# mark1_foreground #1E1E2E
|
||||
# mark1_background #B4BEFE
|
||||
# mark2_foreground #1E1E2E
|
||||
# mark2_background #CBA6F7
|
||||
# mark3_foreground #1E1E2E
|
||||
# mark3_background #74C7EC
|
||||
# color0 #45475A
|
||||
# color8 #585B70
|
||||
# color1 #F38BA8
|
||||
# color9 #F38BA8
|
||||
# color2 #A6E3A1
|
||||
# color10 #A6E3A1
|
||||
# color3 #F9E2AF
|
||||
# color11 #F9E2AF
|
||||
# color4 #89B4FA
|
||||
# color12 #89B4FA
|
||||
# color5 #F5C2E7
|
||||
# color13 #F5C2E7
|
||||
# color6 #94E2D5
|
||||
# color14 #94E2D5
|
||||
# color7 #BAC2DE
|
||||
# color15 #A6ADC8
|
||||
# '';
|
||||
extraConfig = ''
|
||||
foreground #CDD6F4
|
||||
background #1E1E2E
|
||||
selection_foreground #1E1E2E
|
||||
selection_background #F5E0DC
|
||||
cursor #F5E0DC
|
||||
cursor_text_color #1E1E2E
|
||||
url_color #F5E0DC
|
||||
active_border_color #B4BEFE
|
||||
inactive_border_color #6C7086
|
||||
bell_border_color #F9E2AF
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
active_tab_foreground #11111B
|
||||
active_tab_background #CBA6F7
|
||||
inactive_tab_foreground #CDD6F4
|
||||
inactive_tab_background #181825
|
||||
tab_bar_background #11111B
|
||||
mark1_foreground #1E1E2E
|
||||
mark1_background #B4BEFE
|
||||
mark2_foreground #1E1E2E
|
||||
mark2_background #CBA6F7
|
||||
mark3_foreground #1E1E2E
|
||||
mark3_background #74C7EC
|
||||
color0 #45475A
|
||||
color8 #585B70
|
||||
color1 #F38BA8
|
||||
color9 #F38BA8
|
||||
color2 #A6E3A1
|
||||
color10 #A6E3A1
|
||||
color3 #F9E2AF
|
||||
color11 #F9E2AF
|
||||
color4 #89B4FA
|
||||
color12 #89B4FA
|
||||
color5 #F5C2E7
|
||||
color13 #F5C2E7
|
||||
color6 #94E2D5
|
||||
color14 #94E2D5
|
||||
color7 #BAC2DE
|
||||
color15 #A6ADC8
|
||||
'';
|
||||
settings = {
|
||||
# Font settings
|
||||
bold_font = "IBM Plex Mono:style=Bold";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
programs.mako = {
|
||||
enable = true;
|
||||
actions = true;
|
||||
# backgroundColor = "#1e1e2eff";
|
||||
# borderColor = "#cba6f7ff";
|
||||
backgroundColor = "#1e1e2eff";
|
||||
borderColor = "#cba6f7ff";
|
||||
defaultTimeout = 10000;
|
||||
# font = "IBM Plex Sans 14pt";
|
||||
font = "IBM Plex Sans 14pt";
|
||||
icons = true;
|
||||
layer = "overlay";
|
||||
# textColor = "#cdd6f4ff";
|
||||
textColor = "#cdd6f4ff";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ in {
|
|||
"terminal.external.linuxExec" = "kitty";
|
||||
"update.mode" = "none";
|
||||
"update.showReleaseNotes" = false;
|
||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||
"workbench.iconTheme" = "vscode-icons";
|
||||
"vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
|
||||
"python.formatting.provider" = "black";
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
{
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
# style = "/home/thehedgehog/.config/waybar/style.css"
|
||||
# settings = {
|
||||
# mainBar = {
|
||||
# layer = "top";
|
||||
# position = "top";
|
||||
# height = 32;
|
||||
# modules-left = ["sway/workspaces" "sway/mode"];
|
||||
# modules-center = ["custom/media"];
|
||||
# modules-right = [
|
||||
# "idle_inhibitor"
|
||||
# "pulseaudio"
|
||||
# "network"
|
||||
# "cpu"
|
||||
# "memory"
|
||||
# "temperature"
|
||||
# "backlight"
|
||||
# "battery"
|
||||
# "clock"
|
||||
# "tray"
|
||||
# ];
|
||||
# "sway/workspaces" = {
|
||||
# disable-scroll = true;
|
||||
# enable-bar-scroll = false;
|
||||
# active-only = false;
|
||||
# all-outputs = false;
|
||||
# format = "{icon}";
|
||||
# format-icons = {
|
||||
# "1" = "";
|
||||
# "2" = "";
|
||||
# "3" = "ﭮ";
|
||||
# "4" = "ﱘ";
|
||||
# "5" = "";
|
||||
# };
|
||||
# };
|
||||
# "idle_inhibitor" = {
|
||||
# format = "{icon}";
|
||||
# format-icons = {
|
||||
# "activated" = "";
|
||||
# "deactivated" = "";
|
||||
# };
|
||||
# };
|
||||
# "tray" = {
|
||||
# icon-size = 25;
|
||||
# spacing = 12;
|
||||
# };
|
||||
# "clock" = {
|
||||
# tooltip-format = "<big>{%R:%S}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
# format-alt = "{%d %b %Y}";
|
||||
# };
|
||||
# "cpu" = {
|
||||
# format = "{usage}% ";
|
||||
# interval = 5;
|
||||
# tooltip = false;
|
||||
# # states = {
|
||||
# # ""
|
||||
# # };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
{
|
||||
stylix.targets = {
|
||||
alacritty.enable = false;
|
||||
bemenu.enable = false;
|
||||
dunst.enable = false;
|
||||
feh.enable = false;
|
||||
fish.enable = true;
|
||||
gedit.enable = false;
|
||||
gnome.enable = false;
|
||||
gtk.enable = true;
|
||||
helix.enable = true;
|
||||
kitty.enable = true;
|
||||
mako.enable = true;
|
||||
qutebrowser.enable = true;
|
||||
rofi.enable = false;
|
||||
sway.enable = true;
|
||||
swaylock.enable = true;
|
||||
swaylock.useImage = true;
|
||||
vim.enable = true;
|
||||
vscode.enable = true;
|
||||
xresources.enable = true;
|
||||
};
|
||||
}
|
||||
11
home/wayland/hyprland.nix
Normal file
11
home/wayland/hyprland.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
systemdIntegration = true;
|
||||
disableAutoreload = false;
|
||||
xwayland.enable = true;
|
||||
xwayland.hidpi = true;
|
||||
nvidiaPatches = false;
|
||||
recommendedEnvironment = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@ in {
|
|||
imports = [
|
||||
./keybindings.nix
|
||||
./swaylock.nix
|
||||
./waybar.nix
|
||||
];
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
|
|
@ -30,11 +31,11 @@ in {
|
|||
mouseWarping = true;
|
||||
newWindow = "smart";
|
||||
};
|
||||
# fonts = {
|
||||
# names = ["Input Sans"];
|
||||
# style = "Regular";
|
||||
# size = 12.0;
|
||||
# };
|
||||
fonts = {
|
||||
names = ["Input Sans"];
|
||||
style = "Regular";
|
||||
size = 12.0;
|
||||
};
|
||||
gaps = {
|
||||
inner = 4;
|
||||
outer = 4;
|
||||
|
|
@ -72,9 +73,9 @@ in {
|
|||
eDP-1 = {
|
||||
scale = "1.2";
|
||||
};
|
||||
# "*" = {
|
||||
# bg = "${homeDir}/nix/bgs/tokyo-night/nix-snowflake.png fill";
|
||||
# };
|
||||
"*" = {
|
||||
bg = "${homeDir}/nix/bgs/catppuccin-waves.png fill";
|
||||
};
|
||||
};
|
||||
startup = [
|
||||
{command = "${pkgs.dex}/bin/dex -a";}
|
||||
|
|
@ -96,6 +97,44 @@ in {
|
|||
}
|
||||
];
|
||||
};
|
||||
colors = {
|
||||
background = "#1e1e2e";
|
||||
focused = {
|
||||
border = "#f5c2e7";
|
||||
background = "#1e1e2e";
|
||||
text = "#cdd6f4";
|
||||
indicator = "#f5e0dc";
|
||||
childBorder = "#f5c2e7";
|
||||
};
|
||||
focusedInactive = {
|
||||
border = "#cba6f7";
|
||||
background = "#1e1e2e";
|
||||
text = "#cdd6f4";
|
||||
indicator = "#f5e0dc";
|
||||
childBorder = "#cba6f7";
|
||||
};
|
||||
unfocused = {
|
||||
border = "#cba6f7";
|
||||
background = "#1e1e2e";
|
||||
text = "#cdd6f4";
|
||||
indicator = "#f5e0dc";
|
||||
childBorder = "#cba6f7";
|
||||
};
|
||||
urgent = {
|
||||
border = "#fab387";
|
||||
background = "#1e1e2e";
|
||||
text = "#fab387";
|
||||
indicator = "#6c7086";
|
||||
childBorder = "#fab387";
|
||||
};
|
||||
placeholder = {
|
||||
border = "#6c7086";
|
||||
background = "#1e1e2e";
|
||||
text = "#cdd6f4";
|
||||
indicator = "#6c7086";
|
||||
childBorder = "#6c7086";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
123
home/wayland/waybar.nix
Normal file
123
home/wayland/waybar.nix
Normal file
|
|
@ -0,0 +1,123 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
# style = "/home/thehedgehog/.config/waybar/style.css"
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 32;
|
||||
modules-left = ["sway/workspaces" "sway/mode"];
|
||||
modules-center = ["custom/media"];
|
||||
modules-right = [
|
||||
"idle_inhibitor"
|
||||
"pulseaudio"
|
||||
"network"
|
||||
"cpu"
|
||||
"memory"
|
||||
"temperature"
|
||||
"backlight"
|
||||
"battery"
|
||||
"clock"
|
||||
"tray"
|
||||
];
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
enable-bar-scroll = false;
|
||||
active-only = false;
|
||||
all-outputs = false;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"1" = "";
|
||||
"2" = "";
|
||||
"3" = "ﭮ";
|
||||
"4" = "ﱘ";
|
||||
"5" = "";
|
||||
};
|
||||
};
|
||||
"idle_inhibitor" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"activated" = "";
|
||||
"deactivated" = "";
|
||||
};
|
||||
};
|
||||
"tray" = {
|
||||
icon-size = 25;
|
||||
spacing = 12;
|
||||
};
|
||||
"clock" = {
|
||||
tooltip-format = "<big>{%R:%S}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format-alt = "{%d %b %Y}";
|
||||
};
|
||||
"cpu" = {
|
||||
format = "{usage}% ";
|
||||
interval = 5;
|
||||
tooltip = false;
|
||||
};
|
||||
"memory" = {
|
||||
format = "{}% ";
|
||||
};
|
||||
"temperature" = {
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = ["" "" ""];
|
||||
};
|
||||
"backlight" = {
|
||||
format = "{percent}% {icon}";
|
||||
format-icons = ["" ""];
|
||||
};
|
||||
"battery" = {
|
||||
states = {
|
||||
good = 80;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{capacity}% {icon}";
|
||||
format-charging = "{capacity}% ";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "{time} {icon}";
|
||||
format-icons = ["" "" "" "" ""];
|
||||
};
|
||||
"network" = {
|
||||
format-wifi = "{essid}";
|
||||
format-ethernet = "{ifname}: {ipaddr}/{cidr} ";
|
||||
format-linked = "{ifname} (No IP) ";
|
||||
format-disconnected = "Disconnected! ⚠";
|
||||
format-alt = "{ifname}: {ipaddr}/{cidr}";
|
||||
on-click = lib.getExe pkgs.networkmanagerapplet;
|
||||
};
|
||||
"pulseaudio" = {
|
||||
format = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = " {icon} {format_source}";
|
||||
format-muted = " {format_source}";
|
||||
format-source = "{volume}% ";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
};
|
||||
on-click = lib.getExe pkgs.pavucontrol;
|
||||
};
|
||||
"custom/media" = {
|
||||
format = "{icon}{}";
|
||||
return-type = "json";
|
||||
format-icons = {
|
||||
Playing = " ";
|
||||
Paused = " ";
|
||||
};
|
||||
max-length =70;
|
||||
exec = "${lib.getExe pkgs.playerctl} -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F";
|
||||
on-click = "${lib.getExe pkgs.playerctl} play-pause";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
|
|
|||
|
|
@ -34,39 +34,5 @@
|
|||
address = "fe80::1";
|
||||
interface = "enp1s0";
|
||||
};
|
||||
# wireguard = {
|
||||
# enable = true;
|
||||
# interfaces = {
|
||||
# wg0 = {
|
||||
# privateKeyFile = "/run/agenix/dn42-privkey";
|
||||
# listenPort = 480;
|
||||
# allowedIPsAsRoutes = false;
|
||||
# peers = [
|
||||
# {
|
||||
# publicKey = "wW5iNQcNa9VphZWicMdc8k7lJbVrXPMtzmWsHBwPqE0=";
|
||||
# persistentKeepalive = 15;
|
||||
# dynamicEndpointRefreshSeconds = 5;
|
||||
# allowedIPs = [
|
||||
# "172.20.43.96/27"
|
||||
# "172.20.0.0/24"
|
||||
# "172.21.0.0/24"
|
||||
# "172.22.0.0/24"
|
||||
# "172.23.0.0/24"
|
||||
# "172.20.0.0/14"
|
||||
# "10.100.0.0/14"
|
||||
# "10.127.0.0/16"
|
||||
# "10.0.0.0/8"
|
||||
# "172.31.0.0/16"
|
||||
# ];
|
||||
# }
|
||||
# ];
|
||||
# postSetup = ''
|
||||
# ${pkgs.iproute2}/bin/ip addr add 172.20.43.96/32 peer 172.20.43.97/32 dev wg0
|
||||
# ${pkgs.iproute2}/bin/ip -6 addr add fe80::1/64 peer fe80::2/64 dev wg0
|
||||
# # ${pkgs.iproute2}/bin/ip route del default dev wg0
|
||||
# '';
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
./misc.nix
|
||||
./packages.nix
|
||||
./qt.nix
|
||||
./theme.nix
|
||||
|
||||
# Security
|
||||
./security/modules.nix
|
||||
|
|
@ -33,6 +32,7 @@
|
|||
./programs/default.nix
|
||||
./programs/dconf.nix
|
||||
./programs/gnupg.nix
|
||||
./programs/hyprland.nix
|
||||
./programs/less.nix
|
||||
./programs/misc.nix
|
||||
./programs/neovim.nix
|
||||
|
|
|
|||
9
hosts/zaphod/programs/hyprland.nix
Normal file
9
hosts/zaphod/programs/hyprland.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
xwayland.hidpi = true;
|
||||
nvidiaPatches = false;
|
||||
recommendedEnvironment = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
{ pkgs, config, inputs, ... }: {
|
||||
imports = [inputs.stylix.nixosModules.stylix];
|
||||
stylix = {
|
||||
image = pkgs.fetchurl {
|
||||
url = "https://github.com/catppuccin/wallpapers/raw/main/misc/waves_right_colored.png";
|
||||
sha256 = "1nc78cdnwskkrcvfyj0s85a9sjyldv6fmz6iia08a257j7x89ain";
|
||||
};
|
||||
homeManagerIntegration.autoImport = true;
|
||||
homeManagerIntegration.followSystem = true;
|
||||
autoEnable = true;
|
||||
base16Scheme = "${pkgs.my-pkgs.catppuccin-theme}/mocha.yaml";
|
||||
fonts = {
|
||||
serif = {
|
||||
package = pkgs.ibm-plex;
|
||||
name = "IBM Plex Serif";
|
||||
};
|
||||
sansSerif = {
|
||||
package = pkgs.ibm-plex;
|
||||
name = "IBM Plex Sans";
|
||||
};
|
||||
monospace = {
|
||||
package = pkgs.ibm-plex;
|
||||
name = "IBM Plex Mono";
|
||||
};
|
||||
emoji = {
|
||||
package = pkgs.joypixels;
|
||||
name = "JoyPixels";
|
||||
};
|
||||
};
|
||||
targets = {
|
||||
chromium.enable = false;
|
||||
console.enable = true;
|
||||
feh.enable = false;
|
||||
fish.enable = true;
|
||||
gnome.enable = false;
|
||||
grub.enable = false;
|
||||
gtk.enable = true;
|
||||
lightdm.enable = false;
|
||||
plymouth.enable = true;
|
||||
plymouth.blackBackground = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue