Merge branch 'main' of ssh://gitea.xeovalyte.dev:2222/xeovalyte/nix
Merge
This commit is contained in:
commit
114b4f08a6
16
flake.lock
generated
16
flake.lock
generated
@ -97,16 +97,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716729592,
|
||||
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
|
||||
"lastModified": 1716736833,
|
||||
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
|
||||
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.11",
|
||||
"ref": "release-24.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@ -220,16 +220,16 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716633019,
|
||||
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
|
||||
"lastModified": 1717144377,
|
||||
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
|
||||
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"ref": "nixos-24.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
|
@ -2,12 +2,12 @@
|
||||
description = "Nixos configuration for Xeovalyte";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "nixpkgs/nixos-24.05";
|
||||
|
||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
@ -53,6 +53,6 @@
|
||||
# Keyboard
|
||||
hardware.ckb-next.enable = true;
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
system.stateVersion = "24.05";
|
||||
|
||||
}
|
||||
|
@ -39,5 +39,5 @@
|
||||
WLR_NO_HARDWARE_CURSORS = 1;
|
||||
};
|
||||
|
||||
home.stateVersion = "23.11";
|
||||
home.stateVersion = "24.05";
|
||||
}
|
||||
|
@ -43,6 +43,6 @@
|
||||
|
||||
services.printing.enable = true;
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
system.stateVersion = "24.05";
|
||||
|
||||
}
|
||||
|
@ -30,5 +30,5 @@
|
||||
unstable.joplin-desktop
|
||||
];
|
||||
|
||||
home.stateVersion = "23.11";
|
||||
home.stateVersion = "24.05";
|
||||
}
|
||||
|
@ -2,6 +2,7 @@
|
||||
{
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
theme = let
|
||||
inherit (config.lib.formats.rasi) mkLiteral;
|
||||
in {
|
||||
|
@ -29,25 +29,10 @@
|
||||
"on-scroll-down" = "hyprctl dispatch workspace e-1";
|
||||
"on-click" = "activate";
|
||||
"persistent-workspaces" = if hostName == "xv-laptop" then {
|
||||
"1" = [];
|
||||
"2" = [];
|
||||
"3" = [];
|
||||
"4" = [];
|
||||
"5" = [];
|
||||
"6" = [];
|
||||
"7" = [];
|
||||
"8" = [];
|
||||
"*" = 8;
|
||||
} else {
|
||||
"1" = [ "DP-2" ];
|
||||
"2" = [ "DP-2" ];
|
||||
"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" ];
|
||||
"DP-2" = [ 1 2 3 4 5 ];
|
||||
"HDMI-A-1" = [ 6 7 8 9 10 ];
|
||||
};
|
||||
"format-icons" = {
|
||||
"default" = "";
|
||||
|
@ -4,6 +4,9 @@
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
font = {
|
||||
normal = { family = "DejaVuSansM Nerd Font"; style = "Regular"; };
|
||||
};
|
||||
window = {
|
||||
opacity = 0.8;
|
||||
padding = { x = 10; y = 10; };
|
||||
|
@ -19,7 +19,7 @@ in
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "gtk";
|
||||
platformTheme.name = "gtk";
|
||||
style = {
|
||||
name = "gtk2";
|
||||
package = pkgs.qt6Packages.qt6gtk2;
|
||||
|
Loading…
Reference in New Issue
Block a user