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

Compare commits

base: Dandellion:da845c4d84fe68981b8d4a22fce8bc5e7bc6cc92
Branches Tags
Dandellion:master Dandellion:25.11 Dandellion:24.11 Dandellion:23.05
..
compare: Dandellion:23.05
Branches Tags
Dandellion:25.11 Dandellion:master Dandellion:24.11 Dandellion:23.05

1 Commits
da845c4d84 ... 23.05

Author SHA1 Message Date
Daniel Olsen
7b72adab7f add consolidation 2023-11-10 20:18:17 +01:00
7 changed files with 42 additions and 86 deletions
Expand all files Collapse all files

55
flake.lock generated
View File

@@ -35,26 +35,6 @@
"type": "github"
}
},
"greg-clients": {
"inputs": {
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1716115695,
"narHash": "sha256-aI65l4x+U5v3i/nfn6N3eW5IZodmf4pyAByE7vTJh8I=",
"ref": "refs/heads/master",
"rev": "b9444658fbb39cd1bf1c61ee5a1d5f0641c49abe",
"revCount": 73,
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
},
"original": {
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -62,16 +42,16 @@
]
},
"locked": {
"lastModified": 1715381426,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
"lastModified": 1695108154,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
"rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -84,11 +64,11 @@
]
},
"locked": {
"lastModified": 1713543440,
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
"lastModified": 1685908677,
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
"owner": "guibou",
"repo": "nixGL",
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
"rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5",
"type": "github"
},
"original": {
@@ -99,27 +79,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1716361217,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
"lastModified": 1698942558,
"narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
"rev": "621f51253edffa1d6f08d5fce4f08614c852d17e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1716671200,
"narHash": "sha256-MjfhRf3LhIXPRrlKIxIgLNEt1pySaBwazO6+qALjBtY=",
"lastModified": 1699131694,
"narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "386c4b596d7abb4eab6918b4e91071be06772c82",
"rev": "6226a48fb329802a63da2babbdd2d375713af333",
"type": "github"
},
"original": {
@@ -131,7 +111,6 @@
"root": {
"inputs": {
"dan": "dan",
"greg-clients": "greg-clients",
"home-manager": "home-manager",
"nixgl": "nixgl",
"nixpkgs": "nixpkgs",
@@ -141,11 +120,11 @@
},
"unstable": {
"locked": {
"lastModified": 1716619601,
"narHash": "sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8=",
"lastModified": 1699094435,
"narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "47e03a624662ce399e55c45a5f6da698fc72c797",
"rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
"type": "github"
},
"original": {

9
flake.nix
View File

@@ -5,9 +5,9 @@
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -16,9 +16,6 @@
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.inputs.nixpkgs.follows = "unstable";
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
greg-clients.inputs.nixpkgs.follows = "unstable";
# helix.url = "github:helix-editor/helix";
# helix.inputs.nixpkgs.follows = "unstable";
@@ -73,8 +70,6 @@
inherit (prev) system config;
};
dan = dan.packages.${prev.system};
grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients;
gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl;
# helix = inputs.helix.packages.${prev.system}.helix;
})
nur.overlay

4
machines/desktop.nix
View File

@@ -19,8 +19,4 @@
profiles.zsh.enable = true;
profiles.games.enable = true;
home.packages = [
pkgs.unstable.osu-lazer
];
}

33
profiles/base/default.nix
View File

@@ -44,6 +44,8 @@ in
nix-tree
unstable.comma
rnix-lsp
openvpn
ldns
@@ -58,9 +60,6 @@ in
progress
file
bintools
gh
tmux
timewarrior
@@ -68,8 +67,6 @@ in
unzip
p7zip
yt-dlp
parallel
sshfs
jq
@@ -77,16 +74,13 @@ in
ncdu
bat
eza
exa
ripgrep
gregctl
] ++ lib.optionals cfg.plus [
ffmpeg-full
] ++ lib.optionals config.profiles.gui.enable [
mpv
sxiv
gnome3.eog
dolphin
plasma5Packages.dolphin-plugins
@@ -116,7 +110,7 @@ in
mkvtoolnix
] ++ lib.optionals (config.profiles.gui.enable && (config ? nixpkgs && config.nixpkgs.config.allowUnfree) ) [
# geogebra
geogebra
];
programs.firefox = {
@@ -128,11 +122,11 @@ in
};
bookmarks = {
"NixOS Options" = {
keyword = "nxo";
keyword = "no";
url = "https://search.nixos.org/options?query=%s";
};
"NixOS Packages" = {
keyword = "nxp";
keyword = "np";
url = "https://search.nixos.org/packages?query=%s";
};
"Home-Manager Options" = {
@@ -140,7 +134,7 @@ in
url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s";
};
};
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ cookies-txt no-pdf-download sponsorblock ublock-origin ];
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ];
};
};
};
@@ -249,9 +243,6 @@ in
# });
girt = pkgs.git-interactive-rebase-tool;
in "${girt}/bin/interactive-rebase-tool";
branch.sort = "-committerdate";
gpg.format = "ssh";
user.signingKey = "~/.ssh/id_rsa.pub";
};
delta.enable = true;
};
@@ -268,11 +259,6 @@ in
hostname = "desktop.daniel";
user = "dan";
};
"ubuntu-ai" = {
hostname = "100.64.0.2";
port = 2222;
user = "daniel";
};
"laptop" = {
hostname = "laptop.daniel";
user = "daniel";
@@ -296,6 +282,10 @@ in
"gitlab.stud.idi.ntnu.no" = {
proxyJump = "login.pvv.ntnu.no";
};
"consolidation" = {
hostname = "62.92.111.62";
user = "root";
};
};
};
@@ -307,7 +297,6 @@ in
home.sessionVariables = {
EDITOR = "hx";
GRZEGORZ_DEFAULT_API_BASE = "https://georg.pvv.ntnu.no/api";
};
xdg.mimeApps = {

1
profiles/games/default.nix
View File

@@ -25,6 +25,7 @@ in {
# warsow
# xonotic
# zeroad
unstable.osu-lazer
# nur.repos.ivar.sm64ex
# dolphinEmuMaster

18
profiles/xsession/default.nix
View File

@@ -47,6 +47,8 @@ in
export XDG_CURRENT_DESKTOP=kde
export DESKTOP_SESSION=kde
export QT_STYLE_OVERRIDE="breeze"
'';
windowManager = {
@@ -69,11 +71,6 @@ in
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute 0 toggle";
"XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute 1 toggle";
# Georg volume controls
"Shift+XF86AudioRaiseVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- +5%";
"Shift+XF86AudioLowerVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- -5%";
"Shift+XF86AudioMute" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} toggle";
"XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
"XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
@@ -145,7 +142,7 @@ in
gtk = {
enable = true;
enable = false;
theme = {
package = pkgs.breeze-gtk;
name = "Breeze";
@@ -155,10 +152,11 @@ in
name = "breeze";
};
};
# qt = {
# enable = true;
# platformTheme = "gtk";
# };
qt = {
enable = true;
#useGtkTheme = true;
platformTheme = "gtk";
};
xsession.windowManager.command = lib.mkIf non-nixos.enable (lib.mkForce "${pkgs.nixgl.auto.nixGLDefault}/bin/nixGL ${config.xsession.windowManager.i3.package}/bin/i3");

8
profiles/zsh/default.nix
View File

@@ -20,9 +20,9 @@ in
share = false;
};
shellAliases = {
cat = "bat -pp";
ls = "eza";
tree = "eza -T";
cat = "bat";
ls = "exa";
tree = "exa -T";
df = "df -h";
sysu = "systemctl --user";
@@ -78,8 +78,6 @@ in
};
};
programs.zoxide.enable = true;
home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [
pkgs.dan.mesloNFp10k
];