20 Commits

Author SHA1 Message Date
Daniel Olsen
7b72adab7f add consolidation 2023-11-10 20:18:17 +01:00
Daniel Olsen
556a31b334 add wackattack ssh config 2023-11-06 10:30:09 +01:00
Daniel Olsen
8fa457dc8d toggle voice-changer 2023-11-06 10:17:26 +01:00
Daniel Olsen
760228bcc6 work without overlays 2023-11-04 23:34:27 +01:00
Daniel Olsen
7f333af4b5 lmao puuush 2023-11-04 23:28:47 +01:00
Daniel Olsen
764a209200 Update tailscale hostnames 2023-08-05 21:46:35 +02:00
Daniel Olsen
3b70b6c977 make atuin act more sensibly 2023-06-03 19:14:34 +02:00
Daniel Olsen
09f7f00394 23.05 2023-06-03 04:38:32 +02:00
Daniel Olsen
85dcafb4e0 Add devenv to gitignore 2023-05-19 10:02:27 +02:00
Daniel Olsen
c56fcae38c flake update 2023-05-02 19:50:41 +02:00
Daniel Olsen
14711673b7 enable atuin 2023-05-02 04:26:35 +02:00
Daniel Olsen
1ea1e189bb flake update 2023-04-27 23:39:18 +02:00
Daniel Olsen
060ab92af6 Install openvpn for htb 2023-04-27 23:26:48 +02:00
Daniel Olsen
7fe0dc8d53 Install often used packages 2023-04-27 23:26:20 +02:00
Daniel Olsen
172ef4ec81 add lock screen button 2023-04-27 13:36:59 +02:00
Daniel Olsen
b1ce7ce98f flake update use normal helix 2023-04-27 13:17:48 +02:00
Daniel Olsen
abec0c9f38 fix girt 2023-04-27 12:02:42 +02:00
Daniel Olsen
90410802c3 update ssh files wit new vpn names 2023-04-27 11:51:34 +02:00
Daniel Olsen
2bf5d3c165 install timewarrior 2023-01-19 00:38:49 +01:00
Daniel Olsen
fd22fa23b7 limit app slice to less than all ram as well 2023-01-16 11:09:00 +01:00
7 changed files with 129 additions and 305 deletions

280
flake.lock generated
View File

@@ -1,21 +1,5 @@
{ {
"nodes": { "nodes": {
"crane": {
"flake": false,
"locked": {
"lastModified": 1670900067,
"narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
"owner": "ipetkov",
"repo": "crane",
"rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"dan": { "dan": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -36,105 +20,6 @@
"url": "https://git.dodsorf.as/Dandellion/NUR.git" "url": "https://git.dodsorf.as/Dandellion/NUR.git"
} }
}, },
"devshell": {
"flake": false,
"locked": {
"lastModified": 1667210711,
"narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
"owner": "numtide",
"repo": "devshell",
"rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"dream2nix": {
"inputs": {
"alejandra": [
"helix",
"nci"
],
"all-cabal-json": [
"helix",
"nci"
],
"crane": "crane",
"devshell": [
"helix",
"nci",
"devshell"
],
"flake-parts": "flake-parts",
"flake-utils-pre-commit": [
"helix",
"nci"
],
"ghc-utils": [
"helix",
"nci"
],
"gomod2nix": [
"helix",
"nci"
],
"mach-nix": [
"helix",
"nci"
],
"nix-pypi-fetcher": [
"helix",
"nci"
],
"nixpkgs": [
"helix",
"nci",
"nixpkgs"
],
"poetry2nix": [
"helix",
"nci"
],
"pre-commit-hooks": [
"helix",
"nci"
]
},
"locked": {
"lastModified": 1671323629,
"narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "dream2nix",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1668450977,
"narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
@@ -150,105 +35,40 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"helix": {
"inputs": {
"nci": "nci",
"nixpkgs": [
"unstable"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1673624525,
"narHash": "sha256-lcNKkBEct4jVGqvkeIkc6lj9O8YjttEt0voUGLXGo14=",
"owner": "helix-editor",
"repo": "helix",
"rev": "b6331394a3f341ad21f8fad3e6e0b93becda9ce5",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1672244468,
"narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
},
"nci": {
"inputs": {
"devshell": "devshell",
"dream2nix": "dream2nix",
"nixpkgs": [
"helix",
"nixpkgs"
],
"rust-overlay": [
"helix",
"rust-overlay"
] ]
}, },
"locked": { "locked": {
"lastModified": 1671430291, "lastModified": 1695108154,
"narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "yusdacra", "owner": "nix-community",
"repo": "nix-cargo-integration", "repo": "home-manager",
"rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", "rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "yusdacra", "owner": "nix-community",
"repo": "nix-cargo-integration", "ref": "release-23.05",
"repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1672992692, "lastModified": 1685908677,
"narHash": "sha256-/eLQLSNIa22ARTZbk+x8i0iE8khe1eiHWkuxgTVXZ7g=", "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "643e730efb981ffaf8478f441ec9b9aeea1c89f5", "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -259,45 +79,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673704454, "lastModified": 1698942558,
"narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", "narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", "rev": "621f51253edffa1d6f08d5fce4f08614c852d17e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1665349835,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1673834776, "lastModified": 1699131694,
"narHash": "sha256-IZRrfTWEW3lfIA5hkd96VzJ7sNk3I/WsAzYrLWcMS0Q=", "narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "661bfe579c879782223971324dc7799266a2e35e", "rev": "6226a48fb329802a63da2babbdd2d375713af333",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -309,7 +111,6 @@
"root": { "root": {
"inputs": { "inputs": {
"dan": "dan", "dan": "dan",
"helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@@ -317,35 +118,13 @@
"unstable": "unstable" "unstable": "unstable"
} }
}, },
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671416426,
"narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1673606088, "lastModified": 1699094435,
"narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=", "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d", "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -354,21 +133,6 @@
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -1,13 +1,13 @@
{ {
description = "dandellion's home-manager profiles"; description = "dandellion's home-manager profiles";
nixConfig.extra-substituters = ["https://cache.dodsorf.as"]; # nixConfig.extra-substituters = ["https://cache.dodsorf.as"];
nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; # nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
home-manager.url = "github:nix-community/home-manager/release-22.11"; home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -17,8 +17,8 @@
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR"; dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.inputs.nixpkgs.follows = "unstable"; dan.inputs.nixpkgs.follows = "unstable";
helix.url = "github:helix-editor/helix"; # helix.url = "github:helix-editor/helix";
helix.inputs.nixpkgs.follows = "unstable"; # helix.inputs.nixpkgs.follows = "unstable";
nixgl.url = "github:guibou/nixGL"; nixgl.url = "github:guibou/nixGL";
nixgl.inputs.nixpkgs.follows = "nixpkgs"; nixgl.inputs.nixpkgs.follows = "nixpkgs";
@@ -70,7 +70,7 @@
inherit (prev) system config; inherit (prev) system config;
}; };
dan = dan.packages.${prev.system}; dan = dan.packages.${prev.system};
helix = inputs.helix.packages.${prev.system}.helix; # helix = inputs.helix.packages.${prev.system}.helix;
}) })
nur.overlay nur.overlay
nixgl.overlay nixgl.overlay

View File

@@ -10,6 +10,7 @@
name = "DanixLaptop"; name = "DanixLaptop";
eth = "enp0s31f6"; eth = "enp0s31f6";
wlan = "wlp5s0"; wlan = "wlp5s0";
cores = 4;
}; };
profiles.base.enable = true; profiles.base.enable = true;
profiles.base.plus = true; profiles.base.plus = true;

View File

@@ -2,27 +2,16 @@
let let
cfg = config.profiles.base; cfg = config.profiles.base;
helixDesktop = pkgs.makeDesktopItem {
name = "Helix";
type = "Application";
desktopName = "Helix";
genericName = "Text Editor";
comment = "Edit text files";
tryExec = "hx";
exec = "kitty hx %F";
terminal = false; # Until you can globally set a prefered terminal we hardcoding this
mimeTypes = [ "ext/english" "text/plain" "text/x-makefile" "text/x-c++hdr" "text/x-c++src" "text/x-chdr" "text/x-csrc" "text/x-java" "text/x-moc" "text/x-pascal" "text/x-tcl" "text/x-tex" "application/x-shellscript" "text/x-c" "text/x-c++" ];
categories = [ "Utility" "TextEditor" ];
keywords = [ "Text" "editor" ];
startupNotify = false;
};
in in
{ {
options.machine = { options.machine = {
name = lib.mkOption { name = lib.mkOption {
type = lib.types.str; type = lib.types.str;
}; };
cores = lib.mkOption {
type = lib.types.ints.positive;
default = 1;
};
systemd = lib.mkOption { systemd = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;
@@ -56,18 +45,25 @@ in
unstable.comma unstable.comma
rnix-lsp rnix-lsp
helixDesktop
openvpn
ldns ldns
mtr mtr
nmap
inetutils
httpie
lsof lsof
htop htop
progress
file file
tmux tmux
timewarrior
unzip unzip
p7zip p7zip
@@ -113,7 +109,7 @@ in
blender blender
mkvtoolnix mkvtoolnix
] ++ lib.optionals (config.nixpkgs.config.allowUnfree && config.profiles.gui.enable) [ ] ++ lib.optionals (config.profiles.gui.enable && (config ? nixpkgs && config.nixpkgs.config.allowUnfree) ) [
geogebra geogebra
]; ];
@@ -138,9 +134,9 @@ in
url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s"; url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s";
}; };
}; };
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ];
}; };
}; };
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ];
}; };
@@ -226,25 +222,27 @@ in
ignores = [ ignores = [
".envrc" ".envrc"
".direnv" ".direnv"
".devenv"
".vscode" ".vscode"
]; ];
extraConfig = { extraConfig = {
pull.rebase = true; pull.rebase = true;
# sequence.editor = let sequence.editor = let
# girt = pkgs.unstable.git-interactive-rebase-tool.overrideAttrs (old: rec { # girt = pkgs.unstable.git-interactive-rebase-tool.overrideAttrs (old: rec {
# src = pkgs.fetchFromGitHub { # src = pkgs.fetchFromGitHub {
# owner = "Dali99"; # owner = "Dali99";
# repo = "git-interactive-rebase-tool"; # repo = "git-interactive-rebase-tool";
# rev = "590f87d8ed16992373e214bca5994f89c69fa942"; # rev = "590f87d8ed16992373e214bca5994f89c69fa942";
# sha256 = "sha256-vUjqnt5ZSpzoohkzDXEqTMhMEkYzPMUZiaYWS0ZQcPQ="; # sha256 = "sha256-vUjqnt5ZSpzoohkzDXEqTMhMEkYzPMUZiaYWS0ZQcPQ=";
# }; # };
# cargoDeps = old.cargoDeps.overrideAttrs (oldB: { # cargoDeps = old.cargoDeps.overrideAttrs (oldB: {
# name = "${oldB.name}"; # name = "${oldB.name}";
# inherit src; # inherit src;
# outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons="; # outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons=";
# }); # });
# }); # });
# in "${girt}/bin/interactive-rebase-tool"; girt = pkgs.git-interactive-rebase-tool;
in "${girt}/bin/interactive-rebase-tool";
}; };
delta.enable = true; delta.enable = true;
}; };
@@ -254,15 +252,15 @@ in
enable = true; enable = true;
matchBlocks = { matchBlocks = {
"lilith" = { "lilith" = {
hostname = "lilith.dods"; hostname = "lilith.daniel";
user = "dandellion"; user = "dandellion";
}; };
"desktop" = { "desktop" = {
hostname = "nixos-fhjypz8j.dods"; hostname = "desktop.daniel";
user = "dan"; user = "dan";
}; };
"laptop" = { "laptop" = {
hostname = "danixlaptop.dods"; hostname = "laptop.daniel";
user = "daniel"; user = "daniel";
}; };
"pvv.ntnu.no" = { "pvv.ntnu.no" = {
@@ -271,9 +269,23 @@ in
"*.pvv.ntnu.no" = { "*.pvv.ntnu.no" = {
user = "danio"; user = "danio";
}; };
"pascal" = {
hostname = "wiki.wackattack.eu";
port = 1337;
user = "dandellion";
};
"ireul" = {
hostname = "62.92.111.85";
port = 1337;
user = "dandellion";
};
"gitlab.stud.idi.ntnu.no" = { "gitlab.stud.idi.ntnu.no" = {
proxyJump = "login.pvv.ntnu.no"; proxyJump = "login.pvv.ntnu.no";
}; };
"consolidation" = {
hostname = "62.92.111.62";
user = "root";
};
}; };
}; };

View File

@@ -4,7 +4,7 @@ let
cfg = config.profiles.xsession; cfg = config.profiles.xsession;
non-nixos = config.profiles.non-nixos; non-nixos = config.profiles.non-nixos;
mkGL = program: "${lib.strings.optionalString non-nixos.enable "${pkgs.nixgl.auto.nixGLDefault}/bin/nixGL "}${program}"; mkGL = program: "${lib.strings.optionalString non-nixos.enable "${pkgs.nixgl.auto.nixGLDefault}/bin/nixGL "}${program}";
execScope = program: "exec bash -c \"systemd-run --user --scope --unit='app-i3-exec-$RANDOM' -p CollectMode=inactive-or-failed -p MemoryHigh=92% -p MemoryMax=98% \"${program}\"\""; execScope = program: "exec bash -c \"systemd-run --user --scope --unit='app-i3-exec-$RANDOM' -p CollectMode=inactive-or-failed -p MemoryHigh=85% -p MemoryMax=92% -p MemorySwapMax=5G -p MemoryAccounting=true \"${program}\"\"";
in in
{ {
imports = [ ./dunstrc.nix ./terminal.nix ./polybar.nix ]; imports = [ ./dunstrc.nix ./terminal.nix ./polybar.nix ];
@@ -17,6 +17,14 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
profiles.gui.enable = true; profiles.gui.enable = true;
systemd.user.slices.app.Slice = {
MemoryHigh="90%";
MemoryMax="94%";
MemorySwapMax="8G";
CPUQuota="${toString ((config.machine.cores - 1)*100)}%";
MemoryAccounting = true;
};
home.keyboard = { home.keyboard = {
layout = "no"; layout = "no";
variant = "nodeadkeys"; variant = "nodeadkeys";
@@ -69,10 +77,33 @@ in
"Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'"; "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
"${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z"; "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
"${modifier}+l" = "exec ${pkgs.writers.writeBash "hello_world" ''
dunstctl set-paused true
${pkgs.i3lock}/bin/i3lock -n -i ~/images/wallpapers/locked.png
dunstctl set-paused false
''}";
"XF86Display" = "exec arandr"; "XF86Display" = "exec arandr";
"${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode"; "${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
"${modifier}+Shift+s" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuaudio"; "${modifier}+Shift+s" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuaudio";
"${modifier}+Shift+v" = "exec ${pkgs.writers.writeBash "switch_audio" ''
if pw-link -l | grep "^VirtualMic:input_FL" -A 2 | grep FilteredMic; then
${pkgs.pipewire}/bin/pw-link -d "FilteredMic:capture_MONO" "VirtualMic:input_FL"
${pkgs.pipewire}/bin/pw-link -d "FilteredMic:capture_MONO" "VirtualMic:input_FR"
${pkgs.pipewire}/bin/pw-link "VoiceChanger:monitor_FL" "VirtualMic:input_FL"
${pkgs.pipewire}/bin/pw-link "VoiceChanger:monitor_FR" "VirtualMic:input_FR"
${pkgs.pipewire}/bin/pw-link "VoiceChanger:monitor_FL" "VirtualHeadset:playback_FL"
${pkgs.pipewire}/bin/pw-link "VoiceChanger:monitor_FR" "VirtualHeadset:playback_FR"
else
${pkgs.pipewire}/bin/pw-link "FilteredMic:capture_MONO" "VirtualMic:input_FL"
${pkgs.pipewire}/bin/pw-link "FilteredMic:capture_MONO" "VirtualMic:input_FR"
${pkgs.pipewire}/bin/pw-link -d "VoiceChanger:monitor_FL" "VirtualMic:input_FL"
${pkgs.pipewire}/bin/pw-link -d "VoiceChanger:monitor_FR" "VirtualMic:input_FR"
${pkgs.pipewire}/bin/pw-link -d "VoiceChanger:monitor_FL" "VirtualHeadset:playback_FL"
${pkgs.pipewire}/bin/pw-link -d "VoiceChanger:monitor_FR" "VirtualHeadset:playback_FR"
fi
''}";
"${modifier}+d" = "exec ${dmenu}"; "${modifier}+d" = "exec ${dmenu}";
@@ -94,7 +125,13 @@ in
titlebar = false; titlebar = false;
hideEdgeBorders = "smart"; hideEdgeBorders = "smart";
}; };
floating.criteria = [
{ title = "Steam - Update News"; }
];
}; };
i3.extraConfig = ''
for_window [title="Steam Big Picture Mode"] floating enable, resize set 1920 1080, move position 0 0, border pixel 0
'';
}; };
}; };

View File

@@ -68,8 +68,17 @@ in
programs.direnv = { programs.direnv = {
enable = true; enable = true;
}; };
programs.atuin = {
enable = true;
enableZshIntegration = true;
settings = {
filter_mode = "directory";
filter_mode_shell_up_key_binding = "session";
};
};
home.packages = [ home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [
pkgs.dan.mesloNFp10k pkgs.dan.mesloNFp10k
]; ];
}; };

View File

@@ -115,8 +115,9 @@ declare -ga runargs=(
--slice="app.slice" # run as part of `app.slice` --slice="app.slice" # run as part of `app.slice`
--unit="${prefix}${name}-${rand}" --unit="${prefix}${name}-${rand}"
-p MemoryHigh=92% -p MemoryHigh=85%
-p MemoryMax=98% -p MemoryMax=92%
-p MemorySwapMax=5G
# unit name # unit name
--description="dmenu selection ${selection[*]@Q}" --description="dmenu selection ${selection[*]@Q}"
) )