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

Compare commits

base: Dandellion:8c221759c959f5477186d08bb8dca67c63081786
Branches Tags
Dandellion:master
Dandellion:23.05
..
compare: Dandellion:b95ed726eb155c6a3d07de629ca356c7f22c5919
Branches Tags
Dandellion:master
Dandellion:23.05

No commits in common. "8c221759c959f5477186d08bb8dca67c63081786" and "b95ed726eb155c6a3d07de629ca356c7f22c5919" have entirely different histories.
8c221759c9 ... b95ed726eb

2 changed files with 51 additions and 90 deletions
Show Stats Expand all files Collapse all files

95
flake.lock
View File

@ -3,11 +3,11 @@
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670900067, "lastModified": 1661875961,
"narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,7 +68,6 @@
"nci", "nci",
"devshell" "devshell"
], ],
"flake-parts": "flake-parts",
"flake-utils-pre-commit": [ "flake-utils-pre-commit": [
"helix", "helix",
"nci" "nci"
@ -85,10 +84,6 @@
"helix", "helix",
"nci" "nci"
], ],
"nix-pypi-fetcher": [
"helix",
"nci"
],
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nci", "nci",
@ -104,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671323629, "lastModified": 1668851003,
"narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=", "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e", "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,24 +112,6 @@
"type": "github" "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,
@ -174,11 +151,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1671804785, "lastModified": 1669912658,
"narHash": "sha256-vQA5zqnAgws8zxR6G/TFAqjBUYPbqWsE6LxRLnffjYg=", "narHash": "sha256-U2nF7FyRFD59zHfy+3IaiPmFu7MdgyA5TYDBbUikoA4=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "24c3b00d10858a02c6c1c351a7509e204c2bc647", "rev": "a8a54be6bcd0667c50b7c739dbfd072df684b3c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +172,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1670253003, "lastModified": 1669724862,
"narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671430291, "lastModified": 1669011203,
"narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", "rev": "c5133b91fc1d549087c91228bd213f2518728a4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +236,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1671752829, "lastModified": 1669834992,
"narHash": "sha256-oFeJzAq0iRL6md9Si8Tx9bltjwjLmldvgUmAteMhYW4=", "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9898811c658d39b2692d0ab744377e02fd85d08b", "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,31 +250,13 @@
"type": "github" "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",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1671811449, "lastModified": 1669805596,
"narHash": "sha256-x3lmyHkfaDapYaMgKV3olLAxsdF36xvQFxnEUMVdydM=", "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e369ab33b7d8efc7821335b1e369ae0a7cfa62c5", "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +285,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671416426, "lastModified": 1668998422,
"narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=", "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d", "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +300,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1671788672, "lastModified": 1669867399,
"narHash": "sha256-tLkPxJuos3jki2f/TZdHn+NuMQAzN9s2E4QudylQLg0=", "narHash": "sha256-Z8RXSFYOsIsTG96ROKtV0eZ8Q7u4irFWm6ELqfw7mT8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c74fcd6c5fc14a61de158fb796243543f46b217", "rev": "38e591dd05ffc8bdf79dc752ba78b05e370416fa",
"type": "github" "type": "github"
}, },
"original": { "original": {

46
profiles/base/default.nix
View File

@ -139,12 +139,9 @@ in
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt https-everywhere metamask no-pdf-download sponsorblock ublock-origin ]; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt https-everywhere metamask no-pdf-download sponsorblock ublock-origin ];
}; };
programs.obs-studio.enable = (config.profiles.gui.enable && cfg.plus); programs.obs-studio.enable = (config.profiles.gui.enable && cfg.plus);
programs.tealdeer.enable = true;
programs.helix = { programs.helix = {
enable = true; enable = true;
package = pkgs.helix; package = pkgs.helix;
@ -184,7 +181,7 @@ in
keys.insert = { keys.insert = {
"S-tab" = "unindent"; "S-tab" = "unindent";
# Poor man's US-Keyboard # Poor man's US-Keyboard
"Å" = [(c "{}") "move_char_right"]; "Å" = [(c "{}") "move_char_left"];
"º" = c "Å"; "º" = c "Å";
"^" = c "}"; "^" = c "}";
"¤" = c "^"; "¤" = c "^";
@ -220,27 +217,26 @@ in
n = "!git commit --all --amend --no-edit && git rc"; n = "!git commit --all --amend --no-edit && git rc";
}; };
ignores = [ ignores = [
".envrc"
".direnv" ".direnv"
".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"; in "${girt}/bin/interactive-rebase-tool";
}; };
delta.enable = true; delta.enable = true;
}; };
@ -254,11 +250,12 @@ in
user = "dandellion"; user = "dandellion";
}; };
"desktop" = { "desktop" = {
hostname = "nixos-fhjypz8j.dods"; hostname = "10.42.42.10";
proxyJump = "lilith";
user = "dan"; user = "dan";
}; };
"laptop" = { "laptop" = {
hostname = "danixlaptop.dods"; hostname = "10.42.42.13";
user = "daniel"; user = "daniel";
}; };
"pvv.ntnu.no" = { "pvv.ntnu.no" = {
@ -270,6 +267,11 @@ in
"gitlab.stud.idi.ntnu.no" = { "gitlab.stud.idi.ntnu.no" = {
proxyJump = "login.pvv.ntnu.no"; proxyJump = "login.pvv.ntnu.no";
}; };
"workshop" = {
user = "student";
hostname = "129.241.99.15";
proxyJump = "hildring.pvv.ntnu.no";
};
}; };
}; };