further configuration

This commit is contained in:
Rouven Seifert 2023-01-20 14:37:59 +01:00
parent b8efb1ffed
commit 8def55e01e
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
5 changed files with 50 additions and 43 deletions

View file

@ -40,7 +40,9 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixpkgs"
],
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
@ -79,6 +81,26 @@
"type": "github" "type": "github"
} }
}, },
"hyprpaper": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1673799209,
"narHash": "sha256-GMRM1IyIuDEzjEw5E4zWI/TCg3zWs65v86NuR+BAtW0=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "f77a664e9d168fb7b332ede9db4a3e35a46dd6c5",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprpaper",
"type": "github"
}
},
"nix-colors": { "nix-colors": {
"inputs": { "inputs": {
"base16-schemes": "base16-schemes", "base16-schemes": "base16-schemes",
@ -100,15 +122,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673540789, "lastModified": 1673796341,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -145,28 +167,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1673796341,
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },

View file

@ -5,22 +5,27 @@
home-manager.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = github:hyprwm/Hyprland; hyprland.url = github:hyprwm/Hyprland;
hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprpaper.url = github:hyprwm/hyprpaper;
hyprpaper.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = github:Misterio77/nix-colors; nix-colors.url = github:Misterio77/nix-colors;
}; };
outputs = { self, nixpkgs, home-manager, hyprland, sops-nix, nix-colors }: { outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, sops-nix, nix-colors }@attrs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem { thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs.inputs = attrs;
modules = [ modules = [
./hosts/thinkpad ./hosts/thinkpad
./users/rouven ./users/rouven
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
{ {
home-manager.extraSpecialArgs = attrs;
home-manager.users.rouven = { home-manager.users.rouven = {
imports = [ imports = [
nix-colors.homeManagerModule nix-colors.homeManagerModule

View file

@ -25,20 +25,6 @@
text = "CellBackground"; text = "CellBackground";
cursor = "CellForeground"; cursor = "CellForeground";
}; };
#search = {
#matches = {
#foreground = "#44475a";
#background = "#50fa7b";
#};
#focused_match = {
#foreground = "#44475a";
#background = "#ffb86c";
#};
#footer_bar = {
#background = "#282a36";
#foreground = "#f8f8f2";
#};
#};
selection = { selection = {
text = "CellForeground"; text = "CellForeground";
background = "#${config.colorScheme.colors.base03}"; background = "#${config.colorScheme.colors.base03}";

View file

@ -1,12 +1,16 @@
{ config, pkgs, ... }: { config, pkgs, hyprpaper, ... }:
{ {
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.enable = true;
xdg.configFile."hypr/hyprland.conf".source = ./hyprland.conf; xdg.configFile."hypr/hyprland.conf".source = ./hyprland.conf;
xdg.configFile."hypr/hyprpaper.conf".text = ''
preload = ${../../../../images/wallpaper.png}
wallpaper =, ${../../../../images/wallpaper.png}
'';
# TODO integrate this to nix-colors # TODO integrate this to nix-colors
xdg.configFile."wofi".source = ./wofi-config; xdg.configFile."wofi".source = ./wofi-config;
home.packages = with pkgs; [ home.packages = [
wofi pkgs.wofi
#noto-fonts-emoji hyprpaper.packages.x86_64-linux.default
]; ];
programs.waybar = { programs.waybar = {
@ -18,4 +22,9 @@
#}; #};
#}; #};
}; };
programs.mako = {
enable = true;
backgroundColor = "#${config.colorScheme.colors.base00}FF";
};
} }

View file

@ -4,7 +4,7 @@ monitor=eDP-1, 1920x1080, 0x0, 1
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch # Execute your favorite apps at launch
exec-once = waybar exec-once = waybar & hyprpaper
# Source a file (multi-file configs) # Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf # source = ~/.config/hypr/myColors.conf