Compare commits

..

No commits in common. "9b6748e3401373fc7a951df66a2a2f061471c59a" and "86c37fe8c36854410691e7ed4f58d362dfe748ec" have entirely different histories.

6 changed files with 38 additions and 44 deletions

36
flake.lock generated
View file

@ -233,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769776025, "lastModified": 1769289524,
"narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=", "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0", "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1768941735,
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1769461804, "lastModified": 1769170682,
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -573,11 +573,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769469829, "lastModified": 1769314333,
"narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +626,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1769728672, "lastModified": 1769202931,
"narHash": "sha256-/sCPdG7t3r0l8A16+siLKmFScoHkG0oPDM1q0CZgnZ0=", "narHash": "sha256-4IZuCMjlWEtS6rVXozVXaJG6QADHVncXC29PLZr6ZB4=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "861c3c92a9f865d5adae1c1917a6c383170eff13", "rev": "749285c90e3e35ebe0952c86838f3089abbc7939",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -794,11 +794,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769748063, "lastModified": 1769319042,
"narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", "narHash": "sha256-2MmX9m8ZZgXEakZ9us2CsxG8Uz6ZjaFM+Xe5Y7VrZTQ=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", "rev": "500f06314aebde1174ca6da147ccf59259abf6c0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -58,7 +58,7 @@ in {
mods.boot.enable = true; mods.boot.enable = true;
mods.theme.enable = true; mods.theme.enable = true;
mods.theme.scheme = "oxocarbon-dark"; mods.theme.scheme = "woodland";
mods.theme.wallpaper = ./wallpaper.png; mods.theme.wallpaper = ./wallpaper.png;
services.xserver.windowManager.i3.enable = true; services.xserver.windowManager.i3.enable = true;
@ -77,10 +77,10 @@ in {
}; };
# Hardware preferences # Hardware preferences
# environment.variables = { environment.variables = {
# WINIT_HIDPI_FACTOR = "1"; WINIT_HIDPI_FACTOR = "1";
# WINIT_X11_SCALE_FACTOR = "1"; WINIT_X11_SCALE_FACTOR = "1";
# }; };
## Monitors ## Monitors
mods.monitors = { mods.monitors = {

View file

@ -7,7 +7,6 @@
... ...
}: let }: let
cfg = osConfig.mods; cfg = osConfig.mods;
color = config.lib.stylix.colors.withHashtag;
in { in {
# Modules # Modules
mods.xdg.enable = true; mods.xdg.enable = true;
@ -46,20 +45,6 @@ in {
# Non-free </3 # Non-free </3
++ [google-cloud-sdk google-cloud-sql-proxy]; ++ [google-cloud-sdk google-cloud-sql-proxy];
services.flameshot = {
enable = true;
settings = {
General = {
disabledTrayIcon = true;
showStartupLaunchMessage = false;
startupLaunch = true;
uiColor = color.base01;
contrastUiColor = color.base00;
};
};
};
# Hardware preferences # Hardware preferences
## Monitors ## Monitors
xsession.windowManager.i3.config.workspaceOutputAssign = [ xsession.windowManager.i3.config.workspaceOutputAssign = [

View file

@ -5,6 +5,18 @@
osConfig, osConfig,
... ...
}: let }: let
fsss = with pkgs;
writeShellApplication {
name = "fsss";
runtimeInputs = [flameshot curl xsel];
text = ''
flameshot gui -r -s > /tmp/ss.png;if [ ! -s /tmp/ss.png ]; then
exit 1
fi
AUTH=$(cat ${config.sops.secrets.zipline-auth.path})
curl -H "authorization: $AUTH" https://share.muon.host/api/upload -F file=@/tmp/ss.png -H "Content-Type: multipart/form-data" -H "Format: date" -H "Image-Compression-Percent: 90" -H "No-JSON: true" | tr -d '\n' | xsel -ib;
'';
};
zmenu = with pkgs; zmenu = with pkgs;
writeShellApplication { writeShellApplication {
name = "zmenu"; name = "zmenu";
@ -143,10 +155,8 @@ in
// { // {
"XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +2%"; "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +2%";
"XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -2%"; "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -2%";
"Print" = "exec flameshot gui -c -s"; "Print" = "exec ${getExe fsss}";
"${modifier}+z" = "exec ${getExe zmenu}"; "${modifier}+z" = "exec ${getExe zmenu}";
"${modifier}+p" = "exec clipmenu";
"${modifier}+b" = "exec ${getExe pkgs.rofi-rbw-x11}";
"${modifier}+y" = "sticky toggle"; "${modifier}+y" = "sticky toggle";
"${modifier}+g" = "floating toggle"; "${modifier}+g" = "floating toggle";
}); });

View file

@ -48,12 +48,12 @@ in
programs.zsh.sessionVariables.BROWSER = "librewolf"; programs.zsh.sessionVariables.BROWSER = "librewolf";
services.flameshot = { services.flameshot = {
enable = true; enable = false;
settings = { settings = {
General = { General = {
disabledTrayIcon = true; disabledTrayIcon = true;
showStartupLaunchMessage = false; showStartupLaunchMessage = false;
startupLaunch = true; startupLaunch = false;
uiColor = color.base01; uiColor = color.base01;
contrastUiColor = color.base00; contrastUiColor = color.base00;

View file

@ -103,7 +103,6 @@ in {
clipboard = { clipboard = {
enable = true; enable = true;
providers.xclip.enable = true; providers.xclip.enable = true;
registers = "unnamed,unnamedplus";
}; };
mini = { mini = {