Dandellion
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Dandellion:4143c41debb8224166a481276613aa940d5639cd
Branches Tags
Dandellion:master
Dandellion:23.05
..
compare: Dandellion:85dcafb4e0b8382a3d04b9a5f63afd01a4144143
Branches Tags
Dandellion:master
Dandellion:23.05

No commits in common. "4143c41debb8224166a481276613aa940d5639cd" and "85dcafb4e0b8382a3d04b9a5f63afd01a4144143" have entirely different histories.
4143c41deb ... 85dcafb4e0

5 changed files with 67 additions and 69 deletions
Show Stats Expand all files Collapse all files

52
flake.lock
View File

@ -39,19 +39,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1702676849, "lastModified": 1681092193,
"narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=", "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a", "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -64,11 +65,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685908677, "lastModified": 1676383589,
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", "narHash": "sha256-KCkWZXCjH+C4Kn7fUGSrEl5btk+sERHhZueSsvVbPWc=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", "rev": "c917918ab9ebeee27b0dd657263d3f57ba6bb8ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,27 +80,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702346276, "lastModified": 1684280442,
"narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1702673133, "lastModified": 1684349153,
"narHash": "sha256-WWLJaaCSufoQ4kNyIeKJvEFuAMgCvd9BdBeoJEm7YQ0=", "narHash": "sha256-S/QRtvw5t3bQKjBX89eXsQJpEroPd9oUfhTO0eRBQI8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cdf58b69ab208e77fa1d6195983a151c9cd20e9e", "rev": "da988644b16939cd2ccaa5ae2a17250066275361",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +121,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1702539185, "lastModified": 1684242266,
"narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,6 +134,21 @@
"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",

8
flake.nix
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-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-22.11";
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";

38
profiles/base/default.nix
View File

@ -2,6 +2,21 @@
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 = {
@ -45,6 +60,7 @@ in
unstable.comma unstable.comma
rnix-lsp rnix-lsp
helixDesktop
openvpn openvpn
@ -74,7 +90,7 @@ in
ncdu ncdu
bat bat
eza exa
ripgrep ripgrep
] ++ lib.optionals cfg.plus [ ] ++ lib.optionals cfg.plus [
ffmpeg-full ffmpeg-full
@ -109,7 +125,7 @@ in
blender blender
mkvtoolnix mkvtoolnix
] ++ lib.optionals (config.profiles.gui.enable && (config ? nixpkgs && config.nixpkgs.config.allowUnfree) ) [ ] ++ lib.optionals (config.nixpkgs.config.allowUnfree && config.profiles.gui.enable) [
geogebra geogebra
]; ];
@ -134,9 +150,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 ];
}; };
@ -252,15 +268,15 @@ in
enable = true; enable = true;
matchBlocks = { matchBlocks = {
"lilith" = { "lilith" = {
hostname = "lilith.daniel"; hostname = "lilith-xxk090fp.daniel";
user = "dandellion"; user = "dandellion";
}; };
"desktop" = { "desktop" = {
hostname = "desktop.daniel"; hostname = "nixos-il0laur2.daniel";
user = "dan"; user = "dan";
}; };
"laptop" = { "laptop" = {
hostname = "laptop.daniel"; hostname = "danixlaptop-q4838soc.daniel";
user = "daniel"; user = "daniel";
}; };
"pvv.ntnu.no" = { "pvv.ntnu.no" = {
@ -269,16 +285,6 @@ 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";
}; };

28
profiles/xsession/default.nix
View File

@ -47,6 +47,8 @@ in
export XDG_CURRENT_DESKTOP=kde export XDG_CURRENT_DESKTOP=kde
export DESKTOP_SESSION=kde export DESKTOP_SESSION=kde
export QT_STYLE_OVERRIDE="breeze"
''; '';
windowManager = { windowManager = {
@ -85,23 +87,6 @@ in
"${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}";
@ -123,13 +108,7 @@ 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
'';
}; };
}; };
@ -140,7 +119,7 @@ in
gtk = { gtk = {
enable = true; enable = false;
theme = { theme = {
package = pkgs.breeze-gtk; package = pkgs.breeze-gtk;
name = "Breeze"; name = "Breeze";
@ -152,6 +131,7 @@ in
}; };
qt = { qt = {
enable = true; enable = true;
#useGtkTheme = true;
platformTheme = "gtk"; platformTheme = "gtk";
}; };

10
profiles/zsh/default.nix
View File

@ -21,8 +21,8 @@ in
}; };
shellAliases = { shellAliases = {
cat = "bat"; cat = "bat";
ls = "eza"; ls = "exa";
tree = "eza -T"; tree = "exa -T";
df = "df -h"; df = "df -h";
sysu = "systemctl --user"; sysu = "systemctl --user";
@ -72,13 +72,9 @@ in
programs.atuin = { programs.atuin = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = {
filter_mode = "directory";
filter_mode_shell_up_key_binding = "session";
};
}; };
home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [ home.packages = [
pkgs.dan.mesloNFp10k pkgs.dan.mesloNFp10k
]; ];
}; };