Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

Compare commits

base: Myned:196b5e1de06341f6c2559a0716cacba66d660c7c
Branches Tags
Myned:master
..
compare: Myned:f38f84ea0c123694c8fe11acc0ca3a5c331ccef1
Branches Tags
Myned:master

No commits in common. "196b5e1de06341f6c2559a0716cacba66d660c7c" and "f38f84ea0c123694c8fe11acc0ca3a5c331ccef1" have entirely different histories.
196b5e1de0 ... f38f84ea0c

15 changed files with 107 additions and 190 deletions
Show stats Expand all files Collapse all files

11
configuration.nix
View file

@ -48,22 +48,21 @@
stable = nixpkgs "stable"; stable = nixpkgs "stable";
unstable = nixpkgs "unstable"; unstable = nixpkgs "unstable";
master = nixpkgs "master"; staging-next = nixpkgs "staging-next";
dcsunset = nixpkgs "dcsunset";
#// local = nixpkgs "local"; #// local = nixpkgs "local";
in { in {
# Overlay nixpkgs branches # Overlay nixpkgs branches
#?? nixpkgs.BRANCH.PACKAGE #?? nixpkgs.BRANCH.PACKAGE
inherit stable unstable master; inherit stable unstable staging-next;
### Packages ### Packages
# BUG: Build tests often fail on unstable # BUG: Build tests often fail on unstable
# https://github.com/NixOS/nixpkgs/issues/333946 # https://github.com/NixOS/nixpkgs/issues/333946
fprintd = stable.fprintd; fprintd = stable.fprintd;
# TODO: Remove when on unstable # BUG: Empty password regression, remove > v3.9.0 on unstable
# https://github.com/NixOS/nixpkgs/pull/369808 # https://github.com/FreeRDP/FreeRDP/issues/10784
freerdp3 = dcsunset.freerdp3; freerdp3 = stable.freerdp3;
### Development ### Development
#// ciscoPacketTracer8 = local.ciscoPacketTracer8; #// ciscoPacketTracer8 = local.ciscoPacketTracer8;

7
flake.in.nix
View file

@ -36,7 +36,7 @@
stylix-stable = flake "github:danth/stylix/release-24.11" // stable "nixpkgs"; stylix-stable = flake "github:danth/stylix/release-24.11" // stable "nixpkgs";
### Unstable ### Unstable
nixpkgs-unstable = flake "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable = flake "github:NixOS/nixpkgs/nixos-unstable-small";
aagl-gtk-on-nix-unstable = flake "github:ezKEa/aagl-gtk-on-nix" // unstable "nixpkgs"; aagl-gtk-on-nix-unstable = flake "github:ezKEa/aagl-gtk-on-nix" // unstable "nixpkgs";
agenix = flake "github:ryantm/agenix" // unstable "nixpkgs"; agenix = flake "github:ryantm/agenix" // unstable "nixpkgs";
@ -66,9 +66,8 @@
stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs"; stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs";
walker = flake "github:abenz1267/walker?ref=v0.10.15" // unstable "nixpkgs"; walker = flake "github:abenz1267/walker?ref=v0.10.15" // unstable "nixpkgs";
### Branches ### Staging
nixpkgs-dcsunset = flake "github:DCsunset/nixpkgs/update-freerdp3"; nixpkgs-staging-next = flake "github:NixOS/nixpkgs/staging-next";
nixpkgs-master = flake "github:NixOS/nixpkgs/master";
### Development ### Development
#// nixpkgs-local = flake "git+file:///home/myned/SYNC/dev/repo/nixpkgs"; #// nixpkgs-local = flake "git+file:///home/myned/SYNC/dev/repo/nixpkgs";

151
flake.lock generated
View file

@ -1463,11 +1463,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1735344290,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1484,11 +1484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736421950, "lastModified": 1736204492,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1717,11 +1717,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736372092, "lastModified": 1736115213,
"narHash": "sha256-+uxeBRTrDZsH6HtVtlMuJLLPJw3usPpG2/pm/L30c3E=", "narHash": "sha256-x15KPKaSDBe07tQqkBnN1CV3kthMe0RTu9QomIr2YHg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "b4c0fa3ebc6ccd1589dcd17904652223088efede", "rev": "b6b31113ce84419c69ed575c22194e4023d2952a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2177,11 +2177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736409493, "lastModified": 1736230943,
"narHash": "sha256-XezBEaGENmXgndx2gsVxQ0JoHUeQs9OSUZvVx/GDqyQ=", "narHash": "sha256-ip5uSnhTJGYnM6n37dZVykdGWt0CBanbNiuQA818wtY=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "9a958cc0aa5241ea3badf44a063a4b0389dc0110", "rev": "d41e1e88d45d72876cef87ccbf597ca5b99ab4bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2232,11 +2232,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1736412901, "lastModified": 1736073506,
"narHash": "sha256-BlZBzs895dvKE3Y9joC8kxAsTOFBchIWC2YNtWhysew=", "narHash": "sha256-c8UMa0Yb8hYm9D3Q/k+GsRxsk8oTYy2OJywCHjWXrlU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "142e57450dae5eba25b7f306d3c6dc9f51518a3d", "rev": "89678c7b1e6ebe6ec5411db5a2b99bd6bea63565",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2257,11 +2257,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1736416109, "lastModified": 1736149834,
"narHash": "sha256-WXh21oWr1CdyjbHiLgJsxWh3Cgn/PX0emP00jpD+61U=", "narHash": "sha256-newGrF/Y2a457+jjWEwg+oVGeFnSt1UY6zkF/hlSMCY=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "4f9b050c5106d40a56bdf29d1f262711554c158e", "rev": "2ac88ed580655c5cf089b279c7b6227328bb4a95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2290,11 +2290,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736412901, "lastModified": 1736073506,
"narHash": "sha256-BlZBzs895dvKE3Y9joC8kxAsTOFBchIWC2YNtWhysew=", "narHash": "sha256-c8UMa0Yb8hYm9D3Q/k+GsRxsk8oTYy2OJywCHjWXrlU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "142e57450dae5eba25b7f306d3c6dc9f51518a3d", "rev": "89678c7b1e6ebe6ec5411db5a2b99bd6bea63565",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2498,11 +2498,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736388880, "lastModified": 1736214462,
"narHash": "sha256-lA+4MhhcdoanbMnFLjZW+jPdEKcsLs9st2GAst1iuVU=", "narHash": "sha256-JcwPAIcZ3DeNimp+tULr83MBSTTZIfQBwvuhw5wMVt0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "2a84ca07753e3ec608c96ed2907606361979467a", "rev": "9893dc8ad11e92b461e75a8ae51473c8620aa0a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2552,11 +2552,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1736350641, "lastModified": 1735752858,
"narHash": "sha256-7tocojT95MzQb6BczrFd+W7CyNxGqe5Qg8aicqA+yLI=", "narHash": "sha256-YzrT9iIODyf96XLhgDi2ESKvrl1v7iNhMqMdNjTTSW4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "6e581414b2f4c7834aef340118ea7134de98aae3", "rev": "17b7dfd1b4a888ded1bbf875b7601e40f43f94e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2567,11 +2567,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736283893, "lastModified": 1736237814,
"narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2596,22 +2596,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-dcsunset": {
"locked": {
"lastModified": 1735686165,
"narHash": "sha256-BQmEExxMOY+clGXOAcJwozofkTTqDFpgWhM3GVFSUOQ=",
"owner": "DCsunset",
"repo": "nixpkgs",
"rev": "b123dc469da3fcfb85860f4eb6ddb4d63d79a33c",
"type": "github"
},
"original": {
"owner": "DCsunset",
"ref": "update-freerdp3",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1733096140,
@ -2624,22 +2608,6 @@
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1736463205,
"narHash": "sha256-CfGtZWEbLitx2XIsJzAa/vHxvgv4DECfW7g14z2in/w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bc4f1c13b19761d41e24afc84e433bbb9637cc14",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1643052045, "lastModified": 1643052045,
@ -2722,11 +2690,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1736061677,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2738,11 +2706,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1736061677,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2752,18 +2720,34 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-staging-next": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1736265129,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-TvQDNIwBeOZeyvpkgv/66NhFZKux0reAVlDyDu1oukQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "0df29a71359f644693377a0a79deb96a81072392",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "staging-next",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1736296779,
"narHash": "sha256-sCETZgHp3dS6TYMByR3bGjO5rwX6BpFx1bdCpULC8Og=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da76b6311eb169eb526de6feeae7492283fe1f8b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -2924,9 +2908,8 @@
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixd": "nixd", "nixd": "nixd",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs-dcsunset": "nixpkgs-dcsunset",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_5", "nixpkgs-stable": "nixpkgs-stable_5",
"nixpkgs-staging-next": "nixpkgs-staging-next",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"steamtinkerlaunch": "steamtinkerlaunch", "steamtinkerlaunch": "steamtinkerlaunch",
"stylix-stable": "stylix-stable", "stylix-stable": "stylix-stable",
@ -3011,11 +2994,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1736381946, "lastModified": 1736203541,
"narHash": "sha256-k66y4eMHZiJO3N43wuZOdoRmGmNwIj3EZq6NGK+AEM8=", "narHash": "sha256-ucHJzVv3lGxq7v+snqs/rDNwojVyvBHxwQ5yE2qNfNc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "c62df1918d178ade64dc8a2df99e78a5d5f20514", "rev": "45af2a43aaaf05dfb8839dc827c2e2b0d98375da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3047,11 +3030,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736300059, "lastModified": 1736201929,
"narHash": "sha256-z3mR+0gBN/iVM8UgfCSIxjgw4jm1bu1kjMKyQx9mGBc=", "narHash": "sha256-TC6nITVcD+qxjPOWGmLAshuOkILocvzxfHj0Vsu6FAI=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "168306ce7f5d823ccee8b7d4e112ea20671c2b8f", "rev": "1d7b70ed9ee4c3b24ed6b0c7c64a0ee5fcc4ae10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3518,11 +3501,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736399287, "lastModified": 1734745564,
"narHash": "sha256-6S9TXKK/4PZGQkl3GTGq479aRN1Z1pgbSxs6/dNKUJ4=", "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "ba9c1a6a3e00dc01a9a6a2bf57c5fc0c5aa46ed4", "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -121,10 +121,9 @@
url = "github:nix-community/nixd"; url = "github:nix-community/nixd";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs-dcsunset.url = "github:DCsunset/nixpkgs/update-freerdp3";
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-staging-next.url = "github:NixOS/nixpkgs/staging-next";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
steamtinkerlaunch = { steamtinkerlaunch = {
flake = false; flake = false;
url = "github:sonic2kk/steamtinkerlaunch"; url = "github:sonic2kk/steamtinkerlaunch";

15
options/custom/desktops/niri/binds.nix
View file

@ -12,7 +12,6 @@ with lib; let
bash = "${pkgs.bash}/bin/bash"; bash = "${pkgs.bash}/bin/bash";
cat = "${pkgs.coreutils}/bin/cat"; cat = "${pkgs.coreutils}/bin/cat";
codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium"; codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium";
ghostty = "${hm.programs.ghostty.package}/bin/ghostty";
hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock"; hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock";
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker"; hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source; inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source;
@ -61,11 +60,11 @@ in {
}; };
# Launch VM # Launch VM
vm = [ vm = ''${remote} --vm --client xfreerdp --username Myned --password "$(${cat} ${config.age.secrets."desktop/vm/myndows.pass".path})" ${
bash if config.custom.hidpi
"-c" then "--scale 140"
''${remote} --vm --client sdl-freerdp --username Myned --password "$(${cat} ${config.age.secrets."desktop/vm/myndows.pass".path})" myndows'' else ""
]; } myndows'';
in in
listToAttrs (with hm.lib.niri.actions; [ listToAttrs (with hm.lib.niri.actions; [
(key "0" "Mod" (spawn [swayosd-client "--output-volume" "mute-toggle"])) (key "0" "Mod" (spawn [swayosd-client "--output-volume" "mute-toggle"]))
@ -148,8 +147,8 @@ in {
(key "Slash" "Mod+Shift" show-hotkey-overlay) (key "Slash" "Mod+Shift" show-hotkey-overlay)
(key "Space" "Ctrl+Alt" (spawn ["lifx" "toggle"])) (key "Space" "Ctrl+Alt" (spawn ["lifx" "toggle"]))
(key "Space" "Ctrl+Alt" (spawn ["lifx" "toggle"])) (key "Space" "Ctrl+Alt" (spawn ["lifx" "toggle"]))
(key "T" "Ctrl+Alt" (spawn [pkill "ghostty"])) (key "T" "Ctrl+Alt" (spawn [pkill "kitty"]))
(key "T" "Mod" (spawn ghostty)) (key "T" "Mod" (spawn kitty))
(key "Tab" "Mod" switch-focus-between-floating-and-tiling) (key "Tab" "Mod" switch-focus-between-floating-and-tiling)
(key "Up" "Mod" (spawn [swayosd-client "--brightness" "raise"])) (key "Up" "Mod" (spawn [swayosd-client "--brightness" "raise"]))
(key "V" "Mod" (spawn virt-manager)) (key "V" "Mod" (spawn virt-manager))

5
options/custom/desktops/niri/default.nix
View file

@ -97,11 +97,6 @@ in {
(leaf "open-floating" true) (leaf "open-floating" true)
(leaf "open-focused" false) (leaf "open-focused" false)
]) ])
(plain "window-rule" [
(leaf "match" {app-id = "^(sdl-|wl|x)freerdp$";})
(leaf "open-floating" false)
])
]); ]);
# https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options # https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options

27
options/custom/desktops/niri/layout.nix
View file

@ -32,10 +32,7 @@ in {
#// center-focused-column = mkIf config.custom.ultrawide "always"; #// center-focused-column = mkIf config.custom.ultrawide "always";
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutdefault-column-width # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutdefault-column-width
default-column-width.proportion = default-column-width.proportion = 3.0 / 10.0; # 30%
if config.custom.ultrawide
then 0.3 # 30%
else 0.6; # 60%
# TODO: Uncomment after next release > v1.10.1 # TODO: Uncomment after next release > v1.10.1
#// empty-workspace-above-first = true; #// empty-workspace-above-first = true;
@ -59,21 +56,21 @@ in {
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutpreset-column-widths # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutpreset-column-widths
preset-column-widths = [ preset-column-widths = [
{proportion = 0.3;} # 30%, default {proportion = 3.0 / 10.0;} # 30%, default
{proportion = 0.4;} # 40% {proportion = 4.0 / 10.0;} # 40%
{proportion = 0.5;} # 50% {proportion = 5.0 / 10.0;} # 50%
{proportion = 0.6;} # 60% {proportion = 6.0 / 10.0;} # 60%
{proportion = 0.7;} # 70% {proportion = 7.0 / 10.0;} # 70%
]; ];
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutpreset-window-heights # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutpreset-window-heights
preset-window-heights = [ preset-window-heights = [
{proportion = 0.7;} # 70% {proportion = 7.0 / 10.0;} # 70%
{proportion = 0.6;} # 60% {proportion = 6.0 / 10.0;} # 60%
{proportion = 0.5;} # 50% {proportion = 5.0 / 10.0;} # 50%
{proportion = 0.4;} # 40% {proportion = 4.0 / 10.0;} # 40%
{proportion = 0.3;} # 30% {proportion = 3.0 / 10.0;} # 30%
{proportion = 1.0;} # 100%, default {proportion = 10.0 / 10.0;} # 100%, default
]; ];
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutstruts # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutstruts

5
options/custom/desktops/niri/rules.nix
View file

@ -63,11 +63,6 @@ in {
{app-id = "^vivaldi.*$";} {app-id = "^vivaldi.*$";}
]; ];
default-column-width.proportion =
if config.custom.ultrawide
then 0.4
else 0.7;
#// open-on-workspace = "2"; #// open-on-workspace = "2";
} }

48
options/custom/programs/ghostty.nix
View file

@ -5,6 +5,7 @@
}: }:
with lib; let with lib; let
cfg = config.custom.programs.ghostty; cfg = config.custom.programs.ghostty;
hm = config.home-manager.users.${config.custom.username};
in { in {
options.custom.programs.ghostty = { options.custom.programs.ghostty = {
enable = mkOption {default = false;}; enable = mkOption {default = false;};
@ -18,52 +19,7 @@ in {
enable = true; enable = true;
# https://ghostty.org/docs/config/reference # https://ghostty.org/docs/config/reference
settings = rec { settings = {
adjust-cell-width = -1;
# https://ghostty.org/docs/config/reference#adw-toolbar-style
adw-toolbar-style = "flat";
# https://ghostty.org/docs/config/reference#cursor-style-blink
cursor-style-blink = false;
# https://ghostty.org/docs/config/reference#font-family
#?? ghostty +list-fonts
#?? ghostty +show-face
font-family = with config.custom.settings.fonts; [monospace fallback];
font-family-bold = font-family;
# https://ghostty.org/docs/config/reference#font-size
font-size = 14;
# https://ghostty.org/docs/config/reference#gtk-titlebar
gtk-titlebar = false;
# https://ghostty.org/docs/config/reference#mouse-hide-while-typing
mouse-hide-while-typing = true;
# https://ghostty.org/docs/config/reference#shell-integration-features
shell-integration-features = "no-cursor";
# https://ghostty.org/docs/features/theme
# https://ghostty.org/docs/config/reference#theme
#?? ghostty +list-themes
theme = "Builtin Solarized Dark";
# https://ghostty.org/docs/config/reference#window-decoration
window-decoration = false;
# https://ghostty.org/docs/config/reference#window-new-tab-position
window-new-tab-position = "end";
# https://ghostty.org/docs/config/reference#window-padding-balance
# BUG: Not always distributed equally
# https://github.com/ghostty-org/ghostty/discussions/3941
window-padding-balance = true;
# https://ghostty.org/docs/config/reference#window-padding-x
window-padding-x = 8;
window-padding-y = 4;
}; };
}; };
} }

6
options/custom/programs/waybar/default.nix
View file

@ -435,7 +435,11 @@ in {
interval = 5; interval = 5;
on-click = ''${remote} --vm --client sdl-freerdp --username Myned --password "$(${cat} ${config.age.secrets."desktop/vm/myndows.pass".path})" myndows''; on-click = ''${remote} --vm --client xfreerdp --username Myned --password "$(${cat} ${config.age.secrets."desktop/vm/myndows.pass".path})" ${
if config.custom.hidpi
then "--scale 140"
else ""
} myndows'';
on-click-middle = "${virsh} shutdown myndows"; on-click-middle = "${virsh} shutdown myndows";
on-click-right = virt-manager; on-click-right = virt-manager;

6
options/custom/scripts/remote.sh
View file

@ -52,11 +52,7 @@ elif [[ "${argc_client:-}" =~ ^.+freerdp$ ]]; then
"/v:${argc_host:-}" "/v:${argc_host:-}"
"/u:${argc_username:-}" "/u:${argc_username:-}"
"/p:${argc_password:-}" "/p:${argc_password:-}"
"/kbd:remap:015b=0154" # VK_LWIN=<00> #?? xfreerdp /list:kbd-scancode
# BUG: Invalid argument regression?
# https://github.com/FreeRDP/FreeRDP/issues/10810
#// "/kbd:remap:015b=0154" # VK_LWIN=<00> #?? sdl-freerdp /list:kbd-scancode
"/scale:${argc_scale:-}" "/scale:${argc_scale:-}"
"/dynamic-resolution" "/dynamic-resolution"
"/sound" "/sound"

1
options/custom/services/tzupdate.nix
View file

@ -14,7 +14,6 @@ in {
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/misc/tzupdate.nix # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/misc/tzupdate.nix
systemd.services.tzupdate = { systemd.services.tzupdate = {
# FIXME: Fails at boot, possibly needs to wait for tailscaled.service
wantedBy = ["network-online.target"]; # Run at boot without checking for Internet access wantedBy = ["network-online.target"]; # Run at boot without checking for Internet access
}; };
}; };

4
options/custom/settings/dconf/apps.nix
View file

@ -25,7 +25,7 @@ in {
fill-tabs = mkBoolean true; fill-tabs = mkBoolean true;
floating-controls = mkBoolean true; floating-controls = mkBoolean true;
floating-controls-hover-area = mkUint32 10; floating-controls-hover-area = mkUint32 10;
font = mkString "monospace 14"; font = mkString "${config.custom.settings.fonts.monospace} 14";
headerbar-drag-area = mkBoolean false; headerbar-drag-area = mkBoolean false;
notify-process-completion = mkBoolean false; notify-process-completion = mkBoolean false;
opacity = mkUint32 100; opacity = mkUint32 100;
@ -71,7 +71,7 @@ in {
cursor-blink = mkBoolean false; cursor-blink = mkBoolean false;
gtk-enable-primary-paste = mkBoolean false; gtk-enable-primary-paste = mkBoolean false;
color-scheme = mkString "prefer-dark"; color-scheme = mkString "prefer-dark";
monospace-font-name = mkString "monospace 14"; monospace-font-name = mkString "${config.custom.settings.fonts.monospace} 14";
}; };
# GNOME Files # GNOME Files

4
options/custom/settings/fonts.nix
View file

@ -10,7 +10,6 @@ in {
options.custom.settings.fonts = { options.custom.settings.fonts = {
enable = mkOption {default = false;}; enable = mkOption {default = false;};
emoji = mkOption {default = "Noto Color Emoji";}; emoji = mkOption {default = "Noto Color Emoji";};
fallback = mkOption {default = "Unifont";};
monospace = mkOption {default = "IosevkaTerm NFP SemiBold";}; monospace = mkOption {default = "IosevkaTerm NFP SemiBold";};
sans-serif = mkOption {default = "Outfit";}; sans-serif = mkOption {default = "Outfit";};
serif = mkOption {default = "Liberation Serif";}; serif = mkOption {default = "Liberation Serif";};
@ -55,9 +54,6 @@ in {
# Microsoft # Microsoft
corefonts corefonts
vistafonts vistafonts
# Fallback
unifont
]); ]);
#?? fc-list --brief | grep family: | sort #?? fc-list --brief | grep family: | sort

2
options/custom/settings/gtk/default.nix
View file

@ -41,7 +41,7 @@ in {
}; };
gtk4 = { gtk4 = {
#// extraConfig.gtk-hint-font-metrics = 1; # Fix blurry fonts extraConfig.gtk-hint-font-metrics = 1; # Fix blurry fonts
extraCss = css; extraCss = css;
}; };
}; };