This commit is contained in:
parent
00bebbe34a
commit
d03af49808
13 changed files with 95 additions and 71 deletions
51
flake.lock
generated
51
flake.lock
generated
|
|
@ -123,16 +123,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758463745,
|
"lastModified": 1764177491,
|
||||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
"narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
"rev": "2217780c39169a9c77915200137550c2ef0fa974",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -160,48 +160,32 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761597516,
|
"lastModified": 1764020296,
|
||||||
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
|
"narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
|
"rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-25_05": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1747610100,
|
|
||||||
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-25.05",
|
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747179050,
|
"lastModified": 1764192966,
|
||||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
"narHash": "sha256-gGwJNJTb4p90y3VG0QbgnpCi6RFm0p+QFMp+jGqXj+A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
"rev": "dcab162b6c4416f205dfb8c3603c76f2245644e2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-25.11-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -237,20 +221,19 @@
|
||||||
"blobs": "blobs",
|
"blobs": "blobs",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2"
|
||||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755110674,
|
"lastModified": 1764185122,
|
||||||
"narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
|
"narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "f5936247dbdb8501221978562ab0b302dd75456c",
|
"rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
description = "Configuration for my homes & OSs";
|
description = "Configuration for my homes & OSs";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixgl = {
|
nixgl = {
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
st-flexipatch.url = "https://git.antoinevaure.fr/ant/st-flexipatch/archive/master.zip";
|
st-flexipatch.url = "https://git.antoinevaure.fr/ant/st-flexipatch/archive/master.zip";
|
||||||
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
|
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
nixosConfigurations.hs = osConfig "hs";
|
nixosConfigurations.hs = osConfig "hs";
|
||||||
nixosConfigurations.ks = osConfig "ks";
|
nixosConfigurations.ks = osConfig "ks";
|
||||||
|
|
||||||
build-all = pkgs.runCommandNoCC "build-all" {
|
build-all = pkgs.runCommand "build-all" {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
let osDerivation = name: self.nixosConfigurations.${name}.config.system.build.toplevel; in
|
let osDerivation = name: self.nixosConfigurations.${name}.config.system.build.toplevel; in
|
||||||
let homeDerivation = name: self.homeConfigurations.${name}.activationPackage; in
|
let homeDerivation = name: self.homeConfigurations.${name}.activationPackage; in
|
||||||
|
|
|
||||||
|
|
@ -69,14 +69,18 @@
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
aliases = {
|
settings = {
|
||||||
co = "checkout";
|
aliases = {
|
||||||
|
co = "checkout";
|
||||||
|
};
|
||||||
|
extraConfig = {
|
||||||
|
pull.rebase = true;
|
||||||
|
};
|
||||||
|
user = {
|
||||||
|
name = config.home.username;
|
||||||
|
email = "${config.home.username}@domain.xyz";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
extraConfig = {
|
|
||||||
pull.rebase = true;
|
|
||||||
};
|
|
||||||
userName = config.home.username;
|
|
||||||
userEmail = "${config.home.username}@domain.xyz";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
${pkgs.rofi-wayland}/bin/rofi -matching normal -sort -show run
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
pkgs.writers.writePython3 "screenshot" { flakeIgnore = [ "E501" ];} ''
|
pkgs.writers.writePython3 "screenshot" { flakeIgnore = [ "E501" ];} ''
|
||||||
import subprocess
|
import subprocess
|
||||||
import re
|
import re
|
||||||
|
|
@ -13,7 +13,7 @@ full screen
|
||||||
viewer
|
viewer
|
||||||
"""
|
"""
|
||||||
|
|
||||||
cmd = '${pkgs.rofi-wayland}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"'
|
cmd = '${config.programs.rofi.package}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"'
|
||||||
result = subprocess.run(cmd,
|
result = subprocess.run(cmd,
|
||||||
input=options,
|
input=options,
|
||||||
stdout=subprocess.PIPE,
|
stdout=subprocess.PIPE,
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
libreoffice
|
libreoffice
|
||||||
keepassxc
|
keepassxc
|
||||||
thunderbird
|
thunderbird
|
||||||
vieb
|
# vieb
|
||||||
gimp
|
gimp
|
||||||
signal-desktop
|
signal-desktop
|
||||||
open-in-mpv
|
open-in-mpv
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
|
|
||||||
animations = {
|
animations = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
bezier = "myBezier, 0, 0, .58, 1";
|
bezier = "myBezier, 0, 0, 0.58, 1";
|
||||||
animation = "global, 1, 1, myBezier";
|
animation = "global, 1, 1, myBezier";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -72,10 +72,6 @@
|
||||||
# no_gaps_when_only = true;
|
# no_gaps_when_only = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
gestures = {
|
|
||||||
workspace_swipe = "off";
|
|
||||||
};
|
|
||||||
|
|
||||||
misc = {
|
misc = {
|
||||||
enable_anr_dialog = false;
|
enable_anr_dialog = false;
|
||||||
disable_hyprland_logo = true;
|
disable_hyprland_logo = true;
|
||||||
|
|
|
||||||
56
home/ui.nix
56
home/ui.nix
|
|
@ -30,7 +30,7 @@ in
|
||||||
nerd-fonts.caskaydia-cove
|
nerd-fonts.caskaydia-cove
|
||||||
cascadia-code
|
cascadia-code
|
||||||
inter
|
inter
|
||||||
emojione
|
joypixels
|
||||||
|
|
||||||
bluetuith
|
bluetuith
|
||||||
keepmenu
|
keepmenu
|
||||||
|
|
@ -54,6 +54,12 @@ in
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
|
builtins.elem (lib.getName pkg) [
|
||||||
|
"joypixels"
|
||||||
|
];
|
||||||
|
nixpkgs.config.joypixels.acceptLicense = true;
|
||||||
|
|
||||||
home.file = {
|
home.file = {
|
||||||
".config/kitty/light.conf".source = dotfiles/kitty/light.conf;
|
".config/kitty/light.conf".source = dotfiles/kitty/light.conf;
|
||||||
".config/kitty/dark.conf".source = dotfiles/kitty/dark.conf;
|
".config/kitty/dark.conf".source = dotfiles/kitty/dark.conf;
|
||||||
|
|
@ -87,7 +93,52 @@ in
|
||||||
subprocess.call(cmd, shell=True)
|
subprocess.call(cmd, shell=True)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
".bin/screenshot".source = (import ./bin/screenshot.nix) pkgs;
|
".bin/screenshot".source = pkgs.writers.writePython3 "screenshot" { flakeIgnore = [ "E501" ];} ''
|
||||||
|
import subprocess
|
||||||
|
import re
|
||||||
|
|
||||||
|
options = """\
|
||||||
|
a selected area (copy)
|
||||||
|
current window (copy)
|
||||||
|
full screen (copy)
|
||||||
|
a selected area
|
||||||
|
current window
|
||||||
|
full screen
|
||||||
|
viewer
|
||||||
|
"""
|
||||||
|
|
||||||
|
cmd = '${config.programs.rofi.package}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"'
|
||||||
|
result = subprocess.run(cmd,
|
||||||
|
input=options,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
shell=True,
|
||||||
|
text=True)
|
||||||
|
|
||||||
|
if result.returncode != 0:
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
choice = result.stdout.strip()
|
||||||
|
cmd = "${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot "
|
||||||
|
if choice == "viewer":
|
||||||
|
filename = subprocess.getoutput("mktemp")
|
||||||
|
cmd += f"save area {filename}"
|
||||||
|
else:
|
||||||
|
cmd += "copy " if re.match(".*(copy)", choice) else "save "
|
||||||
|
|
||||||
|
for k, v in {"a selected area.*": "area ",
|
||||||
|
"current window.*": "active ",
|
||||||
|
"current screen.*": "output ",
|
||||||
|
"all screens.*": "screen "}.items():
|
||||||
|
if re.match(k, choice):
|
||||||
|
cmd += v
|
||||||
|
|
||||||
|
subprocess.call(cmd,
|
||||||
|
shell=True)
|
||||||
|
|
||||||
|
if choice == "viewer":
|
||||||
|
subprocess.run(f"nsxiv -b {filename}", shell=True)
|
||||||
|
'';
|
||||||
|
|
||||||
".bin/ocrzone".source = pkgs.writers.writeBash "ocrzone" ''
|
".bin/ocrzone".source = pkgs.writers.writeBash "ocrzone" ''
|
||||||
${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot save area - | \
|
${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot save area - | \
|
||||||
|
|
@ -299,7 +350,6 @@ in
|
||||||
|
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.rofi-wayland;
|
|
||||||
plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ];
|
plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ];
|
||||||
theme = "theme.rasi";
|
theme = "theme.rasi";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -104,9 +104,9 @@ in
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
services.udev.packages = [
|
# services.udev.packages = [
|
||||||
pkgs.android-udev-rules
|
# pkgs.android-udev-rules
|
||||||
];
|
# ];
|
||||||
|
|
||||||
nix.distributedBuilds = true;
|
nix.distributedBuilds = true;
|
||||||
nix.settings.builders-use-substitutes = true;
|
nix.settings.builders-use-substitutes = true;
|
||||||
|
|
|
||||||
|
|
@ -13,15 +13,8 @@
|
||||||
enable = false;
|
enable = false;
|
||||||
user = "ant";
|
user = "ant";
|
||||||
};
|
};
|
||||||
sddm = {
|
ly = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wayland.enable = true;
|
|
||||||
package = pkgs.kdePackages.sddm;
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
where-is-my-sddm-theme
|
|
||||||
kdePackages.qt5compat
|
|
||||||
];
|
|
||||||
theme = "where_is_my_sddm_theme";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ let utils = import ./utils.nix; in
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gitea-actions-runner = {
|
services.gitea-actions-runner = {
|
||||||
package = pkgs.forgejo-actions-runner;
|
package = pkgs.forgejo-runner;
|
||||||
instances.default = {
|
instances.default = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "monolith";
|
name = "monolith";
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
mailserver = {
|
mailserver = {
|
||||||
|
stateVersion = 1;
|
||||||
enable = true;
|
enable = true;
|
||||||
fqdn = "mail.${domain}";
|
fqdn = "mail.${domain}";
|
||||||
domains = [ domain domainAlex ];
|
domains = [ domain domainAlex ];
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@
|
||||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = [ pkgs.amdvlk ];
|
|
||||||
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue