kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waybar styles

Browse Source
This commit is contained in:
Kopatz
2024-04-29 16:53:11 +02:00
parent f361568d55
commit 9a9c4e4d74
11 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
flake.lock generated
View File

@@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1712079060, "lastModified": 1714136352,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "1381a759b205dff7a6818733118d02253340fd5e", "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713713092, "lastModified": 1714377222,
"narHash": "sha256-rvyr6BBtn3cq5B/48rhJlbIOpxprwlO/71663sd9Gik=", "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2846d5230a3c3923618eabb367deaf8885df580f", "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -142,11 +142,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712386041, "lastModified": 1714043624,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -177,11 +177,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1713521961, "lastModified": 1714201532,
"narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -200,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713528946, "lastModified": 1714355896,
"narHash": "sha256-IBQta+xrEaI2S5UmYrXcgV7Tu7rGLQu2V3TeJseLPSg=", "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "63c1247e12f269396ed2df8cdec3aed1f0f3928c", "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -229,22 +229,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-kavita-update": {
"locked": {
"lastModified": 1714284556,
"narHash": "sha256-/K0dIK4tsBYa3otMs2HqWXR+u6GNBddBa8rxLZ4OrUU=",
"owner": "nevivurn",
"repo": "nixpkgs",
"rev": "c6ffdd6a964698770fee1c5013cfd083f801d879",
"type": "github"
},
"original": {
"owner": "nevivurn",
"ref": "feat/kavita-0.8.1",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1697935651, "lastModified": 1697935651,
@@ -262,11 +246,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1713537308, "lastModified": 1714253743,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -277,11 +261,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713564160, "lastModified": 1714272655,
"narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=", "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c", "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -293,11 +277,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1713728331, "lastModified": 1714395381,
"narHash": "sha256-SqG/zCZlhSdfJGS2EooRLr+5me4z2ekQMrqT2YXSuMM=", "narHash": "sha256-lOlCnbW7NZrMKptx+Oi6e97ejLRBZzO7jOzuEdyOtbg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "8f557dfa37b430807d1e4d001930896d23c04cec", "rev": "4d6ea25b6eccac9c01e255b40d55a13cbda07ede",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -315,7 +299,6 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-kavita-update": "nixpkgs-kavita-update",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur" "nur": "nur"
} }

4
flake.nix
View File

@@ -6,7 +6,6 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
nixpkgs-kavita-update.url = "github:nevivurn/nixpkgs/feat/kavita-0.8.1";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -28,7 +27,6 @@
nixos-hardware, nixos-hardware,
nixos-wsl, nixos-wsl,
nixpkgs-unstable, nixpkgs-unstable,
nixpkgs-kavita-update,
agenix, agenix,
home-manager, home-manager,
home-manager-unstable, home-manager-unstable,
@@ -47,7 +45,7 @@
./users/anon ./users/anon
./modules/collections/server.nix ./modules/collections/server.nix
./systems/server/configuration.nix ./systems/server/configuration.nix
({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages kavita-update]; }) ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
home-manager-unstable.nixosModules.home-manager home-manager-unstable.nixosModules.home-manager
agenix.nixosModules.default agenix.nixosModules.default
]; ];

3
home-manager/hyprland/styles/notifications.css
View File

@@ -47,8 +47,7 @@
#custom-pipewire.muted, #custom-pipewire.muted,
#pulseaudio.muted { #pulseaudio.muted {
background-color: #90b1b1; color: @red;
color: #2a5c45;
} }
#keyboard-state { #keyboard-state {

1
home-manager/hyprland/styles/stats.css
View File

@@ -11,6 +11,7 @@
border: 2px solid @surface1; border: 2px solid @surface1;
} }
#battery, #battery,
#backlight
#cpu, #cpu,
#memory, #memory,
#temperature, #temperature,

23
home-manager/hyprland/styles/style.css
View File

@@ -61,6 +61,29 @@ box {
#mpd { #mpd {
padding: 0 1em; padding: 0 1em;
} }
/* Add spacing for right side modules */
#pulseaudio,
#battery,
#backlight {
padding: 0 0.5em;
}
#battery.charging,
#battery.plugged,
#battery.full
{
color: @green;
}
#battery.critical:not(.charging) {
background-color: #f38ba8;
color:#bf5673;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#clock { #clock {
font-size: 16px; font-size: 16px;

8
home-manager/hyprland/waybar.nix
View File

@@ -73,17 +73,17 @@ in
"pulseaudio" = { "pulseaudio" = {
"format" = "{volume}% {icon}"; "format" = "{volume}% {icon}";
"format-bluetooth" = "{volume}% {icon}"; "format-bluetooth" = "{volume}% {icon}";
"format-muted" = ""; "format-muted" = "🚫";
"format-icons" = { "format-icons" = {
"headphone" = ""; "headphone" = "";
"hands-free" = ""; "hands-free" = "";
"headset" = ""; "headset" = "";
"phone" = ""; "phone" = "";
"portable" = ""; "portable" = "";
"car" = ""; "car" = "";
"default" = [ "default" = [
"" ""
"" ""
]; ];
}; };
"scroll-step" = 1; "scroll-step" = 1;

2
home-manager/nvim.nix
View File

@@ -17,7 +17,7 @@
nodePackages.pyright nodePackages.pyright
nodePackages.eslint nodePackages.eslint
ccls ccls
nodejs_21 nodejs_22
go go
]; ];
}; };

1
modules/collections/laptop.nix
View File

@@ -1,7 +1,6 @@
{pkgs, config, ...}: {pkgs, config, ...}:
{ {
imports = [ imports = [
../graphical/hyprland.nix # TODO
../kernel.nix # use latest kernel ../kernel.nix # use latest kernel
../docker.nix ../docker.nix
]; ];

2
modules/graphical/code.nix
View File

@@ -16,7 +16,7 @@ in
jetbrains.idea-ultimate jetbrains.idea-ultimate
jetbrains.clion jetbrains.clion
insomnia insomnia
nodejs_21 # needed for tabby extension nodejs_22 # needed for tabby extension
]; ];
#environment.sessionVariables = { #environment.sessionVariables = {

8
modules/services/kavita.nix
View File

@@ -32,14 +32,10 @@ in lib.mkIf cfg.enable {
enable = true; enable = true;
user = "kavita"; user = "kavita";
package = let package = let
kavitaPkgs = (import inputs.nixpkgs-kavita-update { backend = pkgs.kavita.backend.overrideAttrs (old: {
inherit (config.nixpkgs) config;
inherit (pkgs.stdenv.hostPlatform) system;
});
backend = kavitaPkgs.kavita.backend.overrideAttrs (old: {
patches = old.patches ++ [./kavita-patches.diff ]; patches = old.patches ++ [./kavita-patches.diff ];
}); });
kavitaPatched = kavitaPkgs.kavita.overrideAttrs (old: { kavitaPatched = pkgs.kavita.overrideAttrs (old: {
backend = backend; backend = backend;
}); });
in kavitaPatched; in kavitaPatched;

7
overlays.nix
View File

@@ -20,11 +20,4 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
kavita-update = final: _prev: {
kavita-update = import inputs.nixpkgs-kavita-update {
system = final.system;
config.allowUnfree = true;
};
};
} }