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

Compare commits

base: Dandellion:172ef4ec810cbb255ecc8ca631ae2951eac6b0c8
Branches Tags
Dandellion:master
Dandellion:23.05
..
compare: Dandellion:2bf5d3c1654b4ee2e107236d529ed00efb2752a8
Branches Tags
Dandellion:master
Dandellion:23.05

No commits in common. "172ef4ec810cbb255ecc8ca631ae2951eac6b0c8" and "2bf5d3c1654b4ee2e107236d529ed00efb2752a8" have entirely different histories.
172ef4ec81 ... 2bf5d3c165

4 changed files with 81 additions and 184 deletions
Show Stats Expand all files Collapse all files

220
flake.lock
View File

@ -36,24 +36,39 @@
"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": { "dream2nix": {
"inputs": { "inputs": {
"alejandra": [
"helix",
"nci"
],
"all-cabal-json": [ "all-cabal-json": [
"helix", "helix",
"nci" "nci"
], ],
"crane": "crane", "crane": "crane",
"devshell": [ "devshell": [
"helix",
"nci"
],
"drv-parts": "drv-parts",
"flake-compat": "flake-compat",
"flake-parts": [
"helix", "helix",
"nci", "nci",
"parts" "devshell"
], ],
"flake-parts": "flake-parts",
"flake-utils-pre-commit": [ "flake-utils-pre-commit": [
"helix", "helix",
"nci" "nci"
@ -79,7 +94,6 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"nixpkgsV1": "nixpkgsV1",
"poetry2nix": [ "poetry2nix": [
"helix", "helix",
"nci" "nci"
@ -87,18 +101,14 @@
"pre-commit-hooks": [ "pre-commit-hooks": [
"helix", "helix",
"nci" "nci"
],
"pruned-racket-catalog": [
"helix",
"nci"
] ]
}, },
"locked": { "locked": {
"lastModified": 1680258209, "lastModified": 1671323629,
"narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,54 +117,21 @@
"type": "github" "type": "github"
} }
}, },
"drv-parts": { "flake-parts": {
"inputs": { "inputs": {
"flake-compat": [ "nixpkgs-lib": "nixpkgs-lib"
"helix",
"nci",
"dream2nix",
"flake-compat"
],
"flake-parts": [
"helix",
"nci",
"dream2nix",
"flake-parts"
],
"nixpkgs": [
"helix",
"nci",
"dream2nix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1680172861, "lastModified": 1668450977,
"narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
"owner": "davhau", "owner": "hercules-ci",
"repo": "drv-parts", "repo": "flake-parts",
"rev": "ced8a52f62b0a94244713df2225c05c85b416110", "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "davhau", "owner": "hercules-ci",
"repo": "drv-parts", "repo": "flake-parts",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github" "type": "github"
} }
}, },
@ -194,15 +171,14 @@
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
], ],
"parts": "parts_2",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1682573887, "lastModified": 1673624525,
"narHash": "sha256-zXGH312vHB9rUdS8GxmggYOqJRDu2toCzlE8kfin1VE=", "narHash": "sha256-lcNKkBEct4jVGqvkeIkc6lj9O8YjttEt0voUGLXGo14=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "222be0f1e769177241eb2d8d8dfb0de42e450820", "rev": "b6331394a3f341ad21f8fad3e6e0b93becda9ce5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +195,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1672244468,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,42 +209,25 @@
"type": "github" "type": "github"
} }
}, },
"mk-naked-shell": {
"flake": false,
"locked": {
"lastModified": 1676572903,
"narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=",
"owner": "yusdacra",
"repo": "mk-naked-shell",
"rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57",
"type": "github"
},
"original": {
"owner": "yusdacra",
"repo": "mk-naked-shell",
"type": "github"
}
},
"nci": { "nci": {
"inputs": { "inputs": {
"devshell": "devshell",
"dream2nix": "dream2nix", "dream2nix": "dream2nix",
"mk-naked-shell": "mk-naked-shell",
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
], ],
"parts": "parts",
"rust-overlay": [ "rust-overlay": [
"helix", "helix",
"rust-overlay" "rust-overlay"
] ]
}, },
"locked": { "locked": {
"lastModified": 1680329418, "lastModified": 1671430291,
"narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +244,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1676383589, "lastModified": 1672992692,
"narHash": "sha256-KCkWZXCjH+C4Kn7fUGSrEl5btk+sERHhZueSsvVbPWc=", "narHash": "sha256-/eLQLSNIa22ARTZbk+x8i0iE8khe1eiHWkuxgTVXZ7g=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "c917918ab9ebeee27b0dd657263d3f57ba6bb8ad", "rev": "643e730efb981ffaf8478f441ec9b9aeea1c89f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +259,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1682493015, "lastModified": 1673704454,
"narHash": "sha256-KiMOAe8u83QDF40Z25kWMkZbqr9U+mvjvEJy5Qvw0nw=", "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "60c0f762658916a4a5b5a36b3e06486f8301daf4", "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,11 +276,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1678375444, "lastModified": 1665349835,
"narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,28 +291,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgsV1": {
"locked": {
"lastModified": 1678500271,
"narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"type": "indirect"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1682589778, "lastModified": 1673834776,
"narHash": "sha256-COXe3mSw30C+AzEdbEnG5r6Rnc8CLkvpBlU7DBvn69g=", "narHash": "sha256-IZRrfTWEW3lfIA5hkd96VzJ7sNk3I/WsAzYrLWcMS0Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6a41a40008705fbfbbbaf4f74ab15bf8d73d8d15", "rev": "661bfe579c879782223971324dc7799266a2e35e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,46 +306,6 @@
"type": "github" "type": "github"
} }
}, },
"parts": {
"inputs": {
"nixpkgs-lib": [
"helix",
"nci",
"nixpkgs"
]
},
"locked": {
"lastModified": 1679737941,
"narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1679737941,
"narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"dan": "dan", "dan": "dan",
@ -422,11 +326,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680315536, "lastModified": 1671416426,
"narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5c8c151bdd639074a0051325c16df1a64ee23497", "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -437,11 +341,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1682535835, "lastModified": 1673606088,
"narHash": "sha256-DrCcsZId29H+mr7yviOfCZeJOnJ51MIWLX3qSwwSpLI=", "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d12fa94d29856187b1c80db4edf4588df986d217", "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -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

11
profiles/base/default.nix
View File

@ -236,7 +236,7 @@ in
]; ];
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";
@ -250,8 +250,7 @@ in
# outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons="; # outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons=";
# }); # });
# }); # });
girt = pkgs.git-interactive-rebase-tool; # in "${girt}/bin/interactive-rebase-tool";
in "${girt}/bin/interactive-rebase-tool";
}; };
delta.enable = true; delta.enable = true;
}; };
@ -261,15 +260,15 @@ in
enable = true; enable = true;
matchBlocks = { matchBlocks = {
"lilith" = { "lilith" = {
hostname = "lilith-xxk090fp.daniel"; hostname = "lilith.dods";
user = "dandellion"; user = "dandellion";
}; };
"desktop" = { "desktop" = {
hostname = "nixos-il0laur2.daniel"; hostname = "nixos-fhjypz8j.dods";
user = "dan"; user = "dan";
}; };
"laptop" = { "laptop" = {
hostname = "danixlaptop-q4838soc.daniel"; hostname = "danixlaptop.dods";
user = "daniel"; user = "daniel";
}; };
"pvv.ntnu.no" = { "pvv.ntnu.no" = {

6
profiles/xsession/default.nix
View File

@ -77,12 +77,6 @@ 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";