2
2
mirror of https://git.feal.no/felixalb/nixos-config.git synced 2024-12-22 12:07:29 +01:00

Compare commits

..

No commits in common. "1eb3cdcc13758d46578b77fec122f4f0f967144c" and "f683a5dce6e5a85fa7231bb1fb5658b9240df9ed" have entirely different histories.

3 changed files with 88 additions and 102 deletions

63
flake.lock generated
View File

@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734366194, "lastModified": 1733572789,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733570843, "lastModified": 1733351379,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "narHash": "sha256-MTMsAhXxMMVHVN99jT8E0afOAOtt3JQWjYpTja94PAU=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8", "rev": "55d07816a0944f06a9df5ef174999a72fa4060c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1734314370, "lastModified": 1710638386,
"narHash": "sha256-9PhjDAAuXP4tuJg+kM1AozKwBFyHHJ8ZqhQD+peqGtg=", "narHash": "sha256-8etSpxJaCYBWTViHqQRR6o76WfDX2CuD1o2UQXQrwao=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "616634de04e87b621bc3d495af114c4e9c6ccd36", "rev": "8f292bc64336ac9559d33c9a074a214d783a4c8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,13 +209,29 @@
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1710628718,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1733759999,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +243,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1698318101,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714", "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +259,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1734323986, "lastModified": 1733550349,
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "394571358ce82dff7411395829aa6a3aad45b907", "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,14 +291,15 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1734546875, "lastModified": 1710644594,
"narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -50,34 +50,7 @@
colors = { colors = {
draw_bold_text_with_bright_colors = true; draw_bold_text_with_bright_colors = true;
# # Tomorrow Night Bright
# gruvbox_material_medium_dark
primary = {
background = "0x282828";
foreground = "0xd4be98";
};
normal = {
black = "0x3c3836";
red = "0xea6962";
green = "0xa9b665";
yellow = "0xd8a657";
blue = "0x7daea3";
magenta = "0xd3869b";
cyan = "0x89b482";
white = "0xd4be98";
};
bright = {
black = "0x3c3836";
red = "0xea6962";
green = "0xa9b665";
yellow = "0xd8a657";
blue = "0x7daea3";
magenta = "0xd3869b";
cyan = "0x89b482";
white = "0xd4be98";
};
# # # Tomorrow Night Bright
# primary = { # primary = {
# background = "0x141414"; # background = "0x141414";
# foreground = "0xeaeaea"; # foreground = "0xeaeaea";
@ -110,61 +83,60 @@
# white = "0xffffff"; # white = "0xffffff";
# }; # };
# Nord: # Nord:
# primary = { primary = {
# background = "0x2e3440"; background = "0x2e3440";
# foreground = "0xd8dee9"; foreground = "0xd8dee9";
# dim_foreground = "0xa5abb6"; dim_foreground = "0xa5abb6";
# }; };
# cursor = { cursor = {
# text = "0x2e3440"; text = "0x2e3440";
# cursor = "0xd8dee9"; cursor = "0xd8dee9";
# }; };
# vi_mode_cursor = { vi_mode_cursor = {
# text = "0x2e3440"; text = "0x2e3440";
# cursor = "0xd8dee9"; cursor = "0xd8dee9";
# }; };
# selection = { selection = {
# text = "CellForeground"; text = "CellForeground";
# background = "0x4c566a"; background = "0x4c566a";
# }; };
# normal = { normal = {
# black = "0x3b4252"; black = "0x3b4252";
# red = "0xbf616a"; red = "0xbf616a";
# green = "0xa3be8c"; green = "0xa3be8c";
# yellow = "0xebcb8b"; yellow = "0xebcb8b";
# blue = "0x81a1c1"; blue = "0x81a1c1";
# magenta = "0xb48ead"; magenta = "0xb48ead";
# cyan = "0x88c0d0"; cyan = "0x88c0d0";
# white = "0xe5e9f0"; white = "0xe5e9f0";
# }; };
# bright = { bright = {
# black = "0x4c566a"; black = "0x4c566a";
# red = "0xbf616a"; red = "0xbf616a";
# green = "0xa3be8c"; green = "0xa3be8c";
# yellow = "0xebcb8b"; yellow = "0xebcb8b";
# blue = "0x81a1c1"; blue = "0x81a1c1";
# magenta = "0xb48ead"; magenta = "0xb48ead";
# cyan = "0x8fbcbb"; cyan = "0x8fbcbb";
# white = "0xeceff4"; white = "0xeceff4";
# }; };
# dim = { dim = {
# black = "0x373e4d"; black = "0x373e4d";
# red = "0x94545d"; red = "0x94545d";
# green = "0x809575"; green = "0x809575";
# yellow = "0xb29e75"; yellow = "0xb29e75";
# blue = "0x68809a"; blue = "0x68809a";
# magenta = "0x8c738c"; magenta = "0x8c738c";
# cyan = "0x6d96a5"; cyan = "0x6d96a5";
# white = "0xaeb3bb"; white = "0xaeb3bb";
# }; };

View File

@ -119,9 +119,6 @@ in {
nnoremap <C-s> <cmd>Telescope find_files<cr> nnoremap <C-s> <cmd>Telescope find_files<cr>
nnoremap <C-g> <cmd>Telescope live_grep<cr> nnoremap <C-g> <cmd>Telescope live_grep<cr>
" Don't darken the background
autocmd VimEnter * highlight normal ctermbg=NONE guibg=NONE
" Show trailing whitespace " Show trailing whitespace
highlight ExtraWhitespace ctermbg=red guibg=red highlight ExtraWhitespace ctermbg=red guibg=red
match ExtraWhitespace /\s\+$/ match ExtraWhitespace /\s\+$/