Compare commits
17 Commits
1576181ed2
...
main
Author | SHA1 | Date | |
---|---|---|---|
ae5002aacf | |||
|
931e3104f2 | ||
c1d7b717f2 | |||
|
d5f07f1b52 | ||
|
af1d183e5a | ||
6c3c974812 | |||
|
25acea774a | ||
|
f1cce84950 | ||
|
abdc3d65af | ||
|
0b1298c5cc | ||
|
ab42b366da | ||
|
a5622e5f55 | ||
|
d8cdfa4c54 | ||
|
211ef28e43 | ||
|
66edf1fbfc | ||
|
6239e08920 | ||
|
ed3d676a9d |
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
- name: Install nix
|
- name: Install nix
|
||||||
uses: DeterminateSystems/nix-installer-action@v19
|
uses: DeterminateSystems/nix-installer-action@v20
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||||
extra_nix_config: |
|
extra_nix_config: |
|
||||||
|
60
flake.lock
generated
60
flake.lock
generated
@@ -9,11 +9,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745165725,
|
"lastModified": 1759632323,
|
||||||
"narHash": "sha256-OnHV8Us04vRsWM0uL1cQez8DumhRi6yE+4K4VLtH6Ws=",
|
"narHash": "sha256-TzLTfXxhOkR/8oOoVEAYQWb81ADGHdKsQXGicC7kR+M=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "arion",
|
"repo": "arion",
|
||||||
"rev": "4f59059633b14364b994503b179a701f5e6cfb90",
|
"rev": "24658a03be2d1a6e1e02c01524775d960a82309c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -45,11 +45,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751313918,
|
"lastModified": 1758805352,
|
||||||
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
|
"narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
|
"rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -67,11 +67,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733312601,
|
"lastModified": 1759362264,
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -103,11 +103,11 @@
|
|||||||
},
|
},
|
||||||
"hardware": {
|
"hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754564048,
|
"lastModified": 1760106635,
|
||||||
"narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=",
|
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113",
|
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -139,11 +139,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753592768,
|
"lastModified": 1758463745,
|
||||||
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -174,11 +174,11 @@
|
|||||||
},
|
},
|
||||||
"nixUnstable": {
|
"nixUnstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754711617,
|
"lastModified": 1760103332,
|
||||||
"narHash": "sha256-WrZ280bT6NzNbBo+CKeJA/NW1rhvN/RUPZczqCpu2mI=",
|
"narHash": "sha256-BMsGVfKl4Q80Pr9T1AkCRljO1bpwCmY8rTBVj8XGuhA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "00b574b1ba8a352f0601c4dde4faff4b534ebb1e",
|
"rev": "870493f9a8cb0b074ae5b411b2f232015db19a65",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -190,11 +190,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754689972,
|
"lastModified": 1759994382,
|
||||||
"narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
|
"narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
|
"rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -221,11 +221,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754498491,
|
"lastModified": 1760038930,
|
||||||
"narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=",
|
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c2ae88e026f9525daf89587f3cbee584b92b6134",
|
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -241,11 +241,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754771961,
|
"lastModified": 1760231832,
|
||||||
"narHash": "sha256-aLtVkt7vTReGT/M51TvKpUNOhvs+XFAdimadlUiOPfg=",
|
"narHash": "sha256-mygBNLydve9b/yGcX9BFBxf7nSborT87fbPjoB/ds0M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "27dfc5e3bedd281be925bc290351890571a720d2",
|
"rev": "91a02e1cb8359d8b00b88d61d0a96e41905143c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -274,11 +274,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754328224,
|
"lastModified": 1759635238,
|
||||||
"narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
|
"narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
|
"rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
nextcloud-client
|
nextcloud-client
|
||||||
|
|
||||||
gramps
|
gramps
|
||||||
sweethome3d.application
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
|
|
||||||
(defwindow bar
|
(defwindow bar
|
||||||
:monitor 0
|
:monitor 1
|
||||||
:geometry (geometry
|
:geometry (geometry
|
||||||
:x "0%"
|
:x "0%"
|
||||||
:y "0%"
|
:y "0%"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
(defwindow calendar
|
(defwindow calendar
|
||||||
:monitor 0
|
:monitor 1
|
||||||
:geometry (geometry
|
:geometry (geometry
|
||||||
:x "0%"
|
:x "0%"
|
||||||
:y "0%"
|
:y "0%"
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
)
|
)
|
||||||
|
|
||||||
(defwindow powermenu
|
(defwindow powermenu
|
||||||
:monitor 0
|
:monitor 1
|
||||||
:stacking "overlay"
|
:stacking "overlay"
|
||||||
:geometry (geometry
|
:geometry (geometry
|
||||||
:anchor "center"
|
:anchor "center"
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
(defvar radio_rev false)
|
(defvar radio_rev false)
|
||||||
|
|
||||||
(defwindow radio
|
(defwindow radio
|
||||||
:monitor 0
|
:monitor 1
|
||||||
:geometry (geometry
|
:geometry (geometry
|
||||||
:x "0%"
|
:x "0%"
|
||||||
:y "0%"
|
:y "0%"
|
||||||
|
@@ -129,7 +129,7 @@
|
|||||||
)
|
)
|
||||||
|
|
||||||
(defwindow sys
|
(defwindow sys
|
||||||
:monitor 0
|
:monitor 1
|
||||||
:stacking "overlay"
|
:stacking "overlay"
|
||||||
:geometry (geometry
|
:geometry (geometry
|
||||||
:x "0%"
|
:x "0%"
|
||||||
|
@@ -7,42 +7,51 @@
|
|||||||
settings = [
|
settings = [
|
||||||
{
|
{
|
||||||
profile.name = "tower_0";
|
profile.name = "tower_0";
|
||||||
profile.outputs = [{
|
|
||||||
criteria = "CEX CX133 0x00000001";
|
|
||||||
mode = "1920x1200@59.972";
|
|
||||||
position = "0,0";
|
|
||||||
scale = 1.0;
|
|
||||||
status = "enable";
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
profile.name = "tower_1";
|
|
||||||
profile.outputs = [{
|
|
||||||
criteria = "AOC 16G3 1DDP7HA000348";
|
|
||||||
mode = "1920x1080@144.000";
|
|
||||||
position = "0,0";
|
|
||||||
status = "enable";
|
|
||||||
scale = 1.0;
|
|
||||||
adaptiveSync = true;
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
profile.name = "tower_2";
|
|
||||||
profile.outputs = [
|
profile.outputs = [
|
||||||
{
|
{
|
||||||
criteria = "AOC 16G3 1DDP7HA000348";
|
criteria = "AOC 24E1W1 GNSKCHA086899";
|
||||||
mode = "1920x1080@144.000";
|
mode = "1920x1080@60.000";
|
||||||
position = "0,0";
|
position = "0,0";
|
||||||
status = "enable";
|
status = "enable";
|
||||||
scale = 1.0;
|
scale = 1.0;
|
||||||
adaptiveSync = true;
|
adaptiveSync = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = "CEX CX133 0x00000001";
|
criteria = "AOC 24E1W1 GNSKBHA080346";
|
||||||
mode = "1920x1200@59.972";
|
mode = "1920x1080@60.000";
|
||||||
position = "0,1080";
|
position = "1920,0";
|
||||||
scale = 1.0;
|
|
||||||
status = "enable";
|
status = "enable";
|
||||||
|
scale = 1.0;
|
||||||
|
adaptiveSync = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
profile.name = "tower_1";
|
||||||
|
profile.outputs = [
|
||||||
|
{
|
||||||
|
criteria = "AOC 24E1W1 GNSKCHA086899";
|
||||||
|
mode = "1920x1080@60.000";
|
||||||
|
position = "0,0";
|
||||||
|
status = "enable";
|
||||||
|
scale = 1.0;
|
||||||
|
adaptiveSync = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
criteria = "AOC 24E1W1 GNSKBHA080346";
|
||||||
|
mode = "1920x1080@60.000";
|
||||||
|
position = "0,0";
|
||||||
|
status = "enable";
|
||||||
|
scale = 1.0;
|
||||||
|
adaptiveSync = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
criteria = "LG UNKNOWN_TBD";
|
||||||
|
mode = "1920x1080@144.000";
|
||||||
|
position = "0,0";
|
||||||
|
status = "enable";
|
||||||
|
scale = 1.0;
|
||||||
|
adaptiveSync = true;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@@ -17,8 +17,12 @@ in {
|
|||||||
dbus-hyprland-environment
|
dbus-hyprland-environment
|
||||||
wayland
|
wayland
|
||||||
|
|
||||||
grim
|
hyprpicker
|
||||||
|
|
||||||
|
hyprshot
|
||||||
slurp
|
slurp
|
||||||
|
satty
|
||||||
|
|
||||||
swappy
|
swappy
|
||||||
cliphist
|
cliphist
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
@@ -166,7 +166,7 @@
|
|||||||
bind = SUPER SHIFT,D,exec, ~/.config/hypr/themes/apatheia/eww/launch_bar
|
bind = SUPER SHIFT,D,exec, ~/.config/hypr/themes/apatheia/eww/launch_bar
|
||||||
|
|
||||||
bind = SUPER, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy
|
bind = SUPER, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy
|
||||||
bind = , Print, exec, grim -g "$(slurp -d)" - | swappy -f -
|
bind = , PRINT, exec, hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command 'wl-copy'
|
||||||
|
|
||||||
bind = SUPER, L, exec, swaylock
|
bind = SUPER, L, exec, swaylock
|
||||||
|
|
||||||
|
@@ -110,7 +110,7 @@
|
|||||||
telegram-desktop &
|
telegram-desktop &
|
||||||
nextcloud &
|
nextcloud &
|
||||||
jellyfin-mpv-shim &
|
jellyfin-mpv-shim &
|
||||||
flameshot &
|
#flameshot &
|
||||||
|
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
@@ -265,7 +265,7 @@
|
|||||||
|
|
||||||
# Screenshots
|
# Screenshots
|
||||||
Print
|
Print
|
||||||
flameshot gui
|
hyprshot -m region
|
||||||
|
|
||||||
# Lock Desktop
|
# Lock Desktop
|
||||||
super + l
|
super + l
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
config = lib.mkIf (config.usercfg.wm == "X11") {
|
config = lib.mkIf (config.usercfg.wm == "X11") {
|
||||||
xsession.windowManager.bspwm = { enable = true; };
|
xsession.windowManager.bspwm = { enable = true; };
|
||||||
services.sxhkd = { enable = true; };
|
services.sxhkd = { enable = true; };
|
||||||
home.packages = with pkgs; [ xrandr arandr flameshot xtrlock i3lock ];
|
home.packages = with pkgs; [ xrandr arandr hyprshot xtrlock i3lock ];
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -7,5 +7,7 @@ in {
|
|||||||
remotePlay.openFirewall = true;
|
remotePlay.openFirewall = true;
|
||||||
extraCompatPackages = with pkgs; [proton-ge-bin];
|
extraCompatPackages = with pkgs; [proton-ge-bin];
|
||||||
};
|
};
|
||||||
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
config = lib.mkIf (config.syscfg.make.develop) {
|
config = lib.mkIf (config.syscfg.make.develop) {
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
|
services.udev.packages = [
|
||||||
|
pkgs.android-udev-rules
|
||||||
|
];
|
||||||
programs.wireshark.enable = true;
|
programs.wireshark.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ wget dconf wireshark ];
|
environment.systemPackages = with pkgs; [ wget dconf wireshark ];
|
||||||
|
@@ -10,7 +10,7 @@ in {
|
|||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages = with pkgs;
|
||||||
[
|
[
|
||||||
# android-tools
|
# android-tools
|
||||||
# androidStudioPackages.canary
|
unstable.androidStudioPackages.canary
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -22,6 +22,7 @@ in {
|
|||||||
"docker"
|
"docker"
|
||||||
"podman"
|
"podman"
|
||||||
"wireshark"
|
"wireshark"
|
||||||
|
"gamemode"
|
||||||
];
|
];
|
||||||
}) config.syscfg.users);
|
}) config.syscfg.users);
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user