andrei/nix-config
1
0
Fork 0
mirror of https://github.com/artagaz/nix-config.git synced 2026-06-24 02:01:32 +07:00
Code Issues Packages Projects Releases Wiki Activity

updated the wal colors, matugen colors, and reformated some files (not all

Browse Source 
of them)
This commit is contained in:
Senior Matt
2026-04-04 15:25:41 +05:00
parent 46b353968f
commit 86fb4ce26b
10 changed files with 286 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+24 -24
View File
@@ -21,11 +21,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@@ -62,11 +62,11 @@
]
},
"locked": {
"lastModified": 1774379316,
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
"lastModified": 1775104157,
"narHash": "sha256-rm/7k0D2J9SP30pyZ2C1HqarDncZDN6KAUI0gzgg4TA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
"rev": "41e6e2ab37763c09db4e639033392cf40900440a",
"type": "github"
},
"original": {
@@ -132,11 +132,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1774400689,
"narHash": "sha256-hHABVYL0rxhVIzc7hZEpvE0eiCKPnevte73Tn6FRolo=",
"lastModified": 1774879171,
"narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
"owner": "BirdeeHub",
"repo": "nix-wrapper-modules",
"rev": "54645978682ff99594a1d1666dde6fac6a8134f2",
"rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
"type": "github"
},
"original": {
@@ -147,11 +147,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1773840656,
"narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
"lastModified": 1774610258,
"narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
"rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611",
"type": "github"
},
"original": {
@@ -163,11 +163,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github"
},
"original": {
@@ -178,11 +178,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"lastModified": 1775036866,
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
"type": "github"
},
"original": {
@@ -204,11 +204,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1774375131,
"narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=",
"lastModified": 1774852850,
"narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=",
"owner": "NotAShelf",
"repo": "nvf",
"rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d",
"rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef",
"type": "github"
},
"original": {
@@ -250,11 +250,11 @@
]
},
"locked": {
"lastModified": 1773722260,
"narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=",
"lastModified": 1774759885,
"narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49",
"rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6",
"type": "github"
},
"original": {
flake.nix
+1 -3
View File
@@ -21,7 +21,5 @@
};
};
outputs = inputs: inputs.flake-parts.lib.mkFlake
{ inherit inputs; }
(inputs.import-tree ./modules);
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
}
modules/programs/matugen/templates/Matugen.colors
+1 -1
View File
@@ -62,7 +62,7 @@ ForegroundVisited={{colors.on_secondary_container.default.hex}}
[Colors:Header][Inactive]
BackgroundAlternate={{colors.surface_container.default.hex}}
BackgroundNormal={{colors.surface.default.hex}}
BackgroundNormal={{colors.surface_container.default.hex}}
DecorationFocus={{colors.primary.default.hex}}
DecorationHover={{colors.primary.default.hex}}
ForegroundActive={{colors.primary.default.hex}}
modules/programs/neovim.nix
+5 -1
View File
@@ -109,7 +109,11 @@
keymaps = [
{
mode = [ "n" "v" "i" ];
mode = [
"n"
"v"
"i"
];
key = "<C-n>";
action = "<cmd>Neotree toggle left<CR>";
}
modules/programs/waybar.nix
+31 -9
View File
@@ -1,4 +1,3 @@
{ self, ... }:
{
flake.nixosModules.waybar = { pkgs, ... }:
{
@@ -19,9 +18,9 @@
bar = {
height = 24;
spacing = 4;
modules-left = [ "niri/workspaces" ];
modules-left = [ "niri/workspaces" "niri/language" ];
modules-center = [ "niri/window" ];
modules-right = [ "niri/language" "tray" "wireplumber" "network" "bluetooth" "power-profiles-daemon" "backlight" "battery" "battery#bat2" "clock" "custom/power" ];
modules-right = [ "tray" "wireplumber" "network" "bluetooth" "power-profiles-daemon" "backlight" "battery" "battery#bat2" "clock" "custom/power" ];
"niri/workspaces" = {
"disable-scroll" = true;
"all-outputs" = true;
@@ -114,13 +113,13 @@
/* `otf-font-awesome` is required to be installed for icons */
font-family: FontAwesome, JetBrainsMonoNerdFontPropo;
font-size: 13pt;
transition-property: background-color;
transition-duration: .25s;
}
window#waybar {
background-color: @background;
color: @cursor;
transition-property: background-color;
transition-duration: .5s;
}
button {
@@ -128,7 +127,8 @@
box-shadow: inset 0 -3px transparent;
/* Avoid rounded borders under each button name */
border: none;
border-radius: 0;
border-radius: 4;
margin: 2 2;
}
#workspaces button {
@@ -137,11 +137,12 @@
}
#workspaces button:hover {
background: rgba(0, 0, 0, 0.2);
background: @color1;
}
#workspaces button.focused, #workspaces button.active {
background-color: @color2;
background-color: @color8;
color: @background;
/* box-shadow: inset 0 -3px @color3; */
}
@@ -158,9 +159,30 @@
#power-profiles-daemon,
#battery,
#clock,
#power {
#custom-power {
margin: 2 0;
padding: 0 10px;
color: @cursor;
border-radius: 4;
}
#bluetooth,
#wireplumber,
#custom-power,
#network {
background-color: @color4;
color: @background;
}
#custom-power {
background-color: @color8;
}
#bluetooth:hover,
#wireplumber:hover,
#network:hover,
#custom-power:hover {
background-color: @color3;
}
#window,
modules/sessions/niri/config.kdl
+7 -7
View File
@@ -174,7 +174,7 @@ layout {
// Color of the ring on the active monitor.
// active-color "#7fc8ff"
active-color "#77863D"
active-color "#4c7f54"
// Color of the ring on inactive monitors.
//
@@ -362,8 +362,8 @@ window-rule {
// Example: enable rounded corners for all windows.
// (This example rule is commented out with a "/-" in front.)
/-window-rule {
geometry-corner-radius 12
window-rule {
geometry-corner-radius 8
clip-to-geometry true
}
@@ -505,10 +505,10 @@ binds {
// To avoid scrolling through workspaces really fast, you can use
// the cooldown-ms property. The bind will be rate-limited to this value.
// You can set a cooldown on any bind, but it's most useful for the wheel.
Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; }
Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; }
Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; }
Mod+WheelScrollDown cooldown-ms=50 { focus-workspace-down; }
Mod+WheelScrollUp cooldown-ms=50 { focus-workspace-up; }
Mod+Ctrl+WheelScrollDown cooldown-ms=50 { move-column-to-workspace-down; }
Mod+Ctrl+WheelScrollUp cooldown-ms=50 { move-column-to-workspace-up; }
Mod+WheelScrollRight { focus-column-right; }
Mod+WheelScrollLeft { focus-column-left; }
modules/sessions/niri/niri.nix
+29 -5
View File
@@ -1,6 +1,6 @@
{ self, ... }:
{
flake.nixosModules.niri = { pkgs, lib, ... }:
flake.nixosModules.niri = { pkgs, lib, config, ... }:
{
imports = [
self.nixosModules.wofi
@@ -9,9 +9,22 @@
];
programs.niri.enable = true;
# services.displayManager.gdm.enable = true;
services.displayManager.ly.enable = true;
security.polkit.enable = true; # Enable polkit.
services.displayManager.ly =
let
xsession-wrapper = pkgs.runCommand "xsession-wrapper-fixed" {
src = config.services.displayManager.sessionData.wrapper;
} ''
cp --preserve=mode $src $out
substituteInPlace $out --replace "X-NIXOS-SYSTEMD-AWARE" "X-NIXOS-SYSTEMD-AWARE|niri"
'';
in {
enable = true;
x11Support = false;
settings = {
setup_cmd = "${xsession-wrapper}";
};
};
services.udisks2.enable = true; # Removable media.
services.gvfs.enable = true; # Nautilus mount and trash support.
@@ -39,12 +52,23 @@
{
home.activation = {
pywal = ''
${pkgs.pywal}/bin/wal -i /home/matthew/Pictures/iriza-katou.jpg --cols16 --saturate 0.15
${pkgs.pywal}/bin/wal -i /home/matthew/Pictures/iriza-katou.jpg --saturate 0.25
'';
};
services.polkit-gnome.enable = true; # Enable Gnome polkit.
systemd.user.services.polkit-gnome = {
Service = {
Restart = "on-failure";
RestartSec = 1;
};
Unit = {
StartLimitIntervalSec = 30;
StartLimitBurst = 10;
};
};
# Symlink config file.
xdg.configFile."niri/config.kdl".source = ./config.kdl;