Merge branch 'main' of ssh://gitea.xeovalyte.dev:2222/xeovalyte/nix

Merge
This commit is contained in:
xeovalyte 2024-06-02 12:13:42 +02:00
commit 114b4f08a6
Signed by: xeovalyte
SSH Key Fingerprint: SHA256:kSQDrQDmKzljJzfGYcd3m9RqHi4h8rSwkZ3sQ9kBURo
10 changed files with 22 additions and 33 deletions

16
flake.lock generated
View File

@ -97,16 +97,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729592, "lastModified": 1716736833,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -220,16 +220,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716633019, "lastModified": 1717144377,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },

View File

@ -2,12 +2,12 @@
description = "Nixos configuration for Xeovalyte"; description = "Nixos configuration for Xeovalyte";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@ -53,6 +53,6 @@
# Keyboard # Keyboard
hardware.ckb-next.enable = true; hardware.ckb-next.enable = true;
system.stateVersion = "23.11"; system.stateVersion = "24.05";
} }

View File

@ -39,5 +39,5 @@
WLR_NO_HARDWARE_CURSORS = 1; WLR_NO_HARDWARE_CURSORS = 1;
}; };
home.stateVersion = "23.11"; home.stateVersion = "24.05";
} }

View File

@ -43,6 +43,6 @@
services.printing.enable = true; services.printing.enable = true;
system.stateVersion = "23.11"; system.stateVersion = "24.05";
} }

View File

@ -30,5 +30,5 @@
unstable.joplin-desktop unstable.joplin-desktop
]; ];
home.stateVersion = "23.11"; home.stateVersion = "24.05";
} }

View File

@ -2,6 +2,7 @@
{ {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland;
theme = let theme = let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;
in { in {

View File

@ -29,25 +29,10 @@
"on-scroll-down" = "hyprctl dispatch workspace e-1"; "on-scroll-down" = "hyprctl dispatch workspace e-1";
"on-click" = "activate"; "on-click" = "activate";
"persistent-workspaces" = if hostName == "xv-laptop" then { "persistent-workspaces" = if hostName == "xv-laptop" then {
"1" = []; "*" = 8;
"2" = [];
"3" = [];
"4" = [];
"5" = [];
"6" = [];
"7" = [];
"8" = [];
} else { } else {
"1" = [ "DP-2" ]; "DP-2" = [ 1 2 3 4 5 ];
"2" = [ "DP-2" ]; "HDMI-A-1" = [ 6 7 8 9 10 ];
"3" = [ "DP-2" ];
"4" = [ "DP-2" ];
"5" = [ "DP-2" ];
"6" = [ "HDMI-A-1" ];
"7" = [ "HDMI-A-1" ];
"8" = [ "HDMI-A-1" ];
"9" = [ "HDMI-A-1" ];
"10" = [ "HDMI-A-1" ];
}; };
"format-icons" = { "format-icons" = {
"default" = ""; "default" = "";

View File

@ -4,6 +4,9 @@
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
settings = { settings = {
font = {
normal = { family = "DejaVuSansM Nerd Font"; style = "Regular"; };
};
window = { window = {
opacity = 0.8; opacity = 0.8;
padding = { x = 10; y = 10; }; padding = { x = 10; y = 10; };

View File

@ -19,7 +19,7 @@ in
qt = { qt = {
enable = true; enable = true;
platformTheme = "gtk"; platformTheme.name = "gtk";
style = { style = {
name = "gtk2"; name = "gtk2";
package = pkgs.qt6Packages.qt6gtk2; package = pkgs.qt6Packages.qt6gtk2;