maddie/config
1
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: maddie:master
Branches Tags
maddie:development
maddie:master
..
compare: maddie:development
Branches Tags
maddie:development
maddie:master

9 Commits
master ... developmen

Author SHA1 Message Date
Maddie H
95f78ddf56
fix: make the default editor neovim on macos too 2024-10-14 17:17:30 +01:00
Maddie H
20ba32069c
feat: add fzf integration keybindings to zsh 2024-10-14 17:13:42 +01:00
Maddie H
f23efee17f
feat: change font and enable zsh integration for wezterm 2024-10-11 18:21:48 +01:00
Maddie H
7ccabe0d39
feat: update ssh shortcode hosts 2024-10-09 22:32:30 +01:00
Maddie H
4ab3b7b6d2
fix: use native macos fullscreen on wezterm to fix menubar hiding 2024-10-09 22:30:05 +01:00
Maddie H
45a68d3ae6
refactor: move jdk17 to a seperate file on laptop system 2024-10-09 22:16:56 +01:00
Maddie H
fa44652c2e
fix: move insect to desktop as it doesnt support darwin 2024-10-09 22:10:28 +01:00
Maddie H
e4da02c68a
feat: update ssh keys, add insect & my neovim config 2024-10-09 18:38:42 +01:00
Maddie H
4267cf7090
fix: fixed a typo in homes/desktop module 2024-10-09 17:35:56 +01:00
14 changed files with 404 additions and 42 deletions
Show Stats Expand all files Collapse all files

375
flake.lock
View File

@ -76,6 +76,64 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"nixpkgs": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"editor": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
"nixvim": "nixvim"
},
"locked": {
"lastModified": 1728397219,
"narHash": "sha256-WLNMnuI0b/9bTzh/MKoohYp3PN7rpIUW7LnHISL/B0Q=",
"owner": "spyhoodle",
"repo": "editor",
"rev": "a6e44c272a0730b9017d1a522bb4952da1b4bda9",
"type": "github"
},
"original": {
"owner": "spyhoodle",
"repo": "editor",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -97,9 +155,49 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1725234343,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -133,6 +231,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -148,7 +264,85 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"editor",
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"editor",
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724857454,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"editor",
"nixvim",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": {
"nixpkgs": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -207,7 +401,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2", "systems": "systems_3",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
@ -348,7 +542,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -371,6 +565,28 @@
} }
}, },
"nix-darwin": { "nix-darwin": {
"inputs": {
"nixpkgs": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724561770,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-darwin_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -391,6 +607,34 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1725233747,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725983898, "lastModified": 1725983898,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
@ -406,14 +650,64 @@
"type": "github" "type": "github"
} }
}, },
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_3",
"git-hooks": "git-hooks",
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1725671303,
"narHash": "sha256-PVMrJ90B5plMxlhFUKZMYjTmBJScdTDbZ1ofrYyRQQo=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "c4135d720a5a57b7ddbd7ee918544c26b2c6f732",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724584782,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
"owner": "NuschtOS",
"repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
"home-manager": "home-manager", "editor": "editor",
"home-manager": "home-manager_2",
"hyprland": "hyprland", "hyprland": "hyprland",
"lix-module": "lix-module", "lix-module": "lix-module",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"woomer": "woomer" "woomer": "woomer"
} }
}, },
@ -433,21 +727,6 @@
} }
}, },
"systems_2": { "systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -462,6 +741,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_4": { "systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -477,10 +771,47 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"editor",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724833132,
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"woomer": { "woomer": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]

4
flake.nix
View File

@ -28,6 +28,10 @@
# Lix Module # Lix Module
lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module?ref=refs/tags/2.91.0"; lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module?ref=refs/tags/2.91.0";
lix-module.inputs.nixpkgs.follows = "nixpkgs"; lix-module.inputs.nixpkgs.follows = "nixpkgs";
# Neovim configuration
editor.url = "github:spyhoodle/editor";
editor.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, home-manager, nix-darwin, ... } @ inputs: outputs = { self, nixpkgs, home-manager, nix-darwin, ... } @ inputs:

2
homes/common/default.nix
View File

@ -21,5 +21,7 @@
./xdg.nix ./xdg.nix
./zsh.nix ./zsh.nix
./radicle.nix ./radicle.nix
./neovim.nix
./fzf.nix
]; ];
} }

3
homes/common/fzf.nix Normal file
View File

@ -0,0 +1,3 @@
{
programs.fzf.enable = true;
}

10
homes/common/neovim.nix Normal file
View File

@ -0,0 +1,10 @@
{ inputs, pkgs, ... }:
{
home.packages = [
inputs.editor.packages.${pkgs.stdenv.hostPlatform.system}.default
];
programs.zsh.shellAliases.vimdiff = "nvim -d";
home.sessionVariables.EDITOR = "nvim";
}

7
homes/common/ssh/default.nix
View File

@ -3,14 +3,11 @@
enable = true; enable = true;
matchBlocks = { matchBlocks = {
jet = { jet = {
identityFile = "~/.ssh/id_ed25519_sk";
hostname = "jet.echo.clicks.domains"; hostname = "jet.echo.clicks.domains";
user = "maddie"; user = "maddie";
}; };
clicks = { desktop = {
identityFile = "~/.ssh/clickscodes"; hostname = "desktop.maddie.clicks.domains";
hostname = "git.clicks.codes";
port = 29418;
user = "maddie"; user = "maddie";
}; };
}; };

7
homes/common/ssh/maddie.pub
View File

@ -1,3 +1,4 @@
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA1jTkcMhBQQoYqNVLofrNnTbB8RCyzSYmdsnPeoOineAAAABHNzaDo= spy@luna (yubikey) sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA1jTkcMhBQQoYqNVLofrNnTbB8RCyzSYmdsnPeoOineAAAABHNzaDo= YubiKey
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO9WsQUnglNetqekCoA6WT0wYNxpUVyNxuktPOHJPBCLJmU9P+YErE915vj4HlYcuOW9UhVajQzLQTcelgs/O8w= M.iPad (Termius) ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO9WsQUnglNetqekCoA6WT0wYNxpUVyNxuktPOHJPBCLJmU9P+YErE915vj4HlYcuOW9UhVajQzLQTcelgs/O8w= Termius (iPad)
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD44bc9OdsIxwNBkdIN5Ce+Wer2gWi+QRcFdOV7+ScIo1QS29wkQJxU90ItcKwqiv+oTBlipV2NSH/YroBSHhQI= M.iPad (Secure ShellFish) ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJEXRfbpfULQp3oy3Ux3eeBTdam2+8z1y9HYNT/DdgUrq/7WPs8j3A5nifq8EahIvzLOSjpr2D+0x09Ty8xsWJk= Termius (iPhone)
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMjSkg3ur6uOMywhmn2t8kaokCuci7E0pTiaxWBlEnA+5I3FWcq5vdLz0Tm/3CsDBzFts5XOLywItRzICUDLG8k= Secretive (MacBook Pro)

4
homes/common/wezterm.nix
View File

@ -1,11 +1,15 @@
{ {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
enableZshIntegration = true;
extraConfig = '' extraConfig = ''
return { return {
front_end = 'WebGpu', front_end = 'WebGpu',
font = wezterm.font 'Iosevka Nerd Font',
font_size = 16,
color_scheme = 'OneDark (base16)', color_scheme = 'OneDark (base16)',
hide_tab_bar_if_only_one_tab = true, hide_tab_bar_if_only_one_tab = true,
native_macos_fullscreen_mode = true,
window_close_confirmation = 'NeverPrompt', window_close_confirmation = 'NeverPrompt',
window_padding = { window_padding = {
left = 0, left = 0,

1
homes/common/xdg.nix
View File

@ -10,6 +10,7 @@
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java"; _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
}; };
shellAliases = { shellAliases = {
wget = "wget --hsts-file='${config.xdg.dataHome}/wget-hsts'"; wget = "wget --hsts-file='${config.xdg.dataHome}/wget-hsts'";
}; };

3
homes/desktop/default.nix
View File

@ -1,5 +1,5 @@
{ {
import = [ imports = [
./alacritty.nix ./alacritty.nix
./anyrun.nix ./anyrun.nix
./audio.nix ./audio.nix
@ -31,5 +31,6 @@
./xdg.nix ./xdg.nix
./xorg.nix ./xorg.nix
./zathura.nix ./zathura.nix
./insect.nix
]; ];
} }

7
homes/desktop/insect.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
nodePackages.insect
];
}

14
homes/desktop/xdg.nix
View File

@ -6,6 +6,11 @@
xdg-user-dirs xdg-user-dirs
]; ];
home.sessionVariables = {
BROWSER = "librewolf";
TERMINAL = "alacritty";
};
xdg = { xdg = {
enable = true; enable = true;
userDirs.enable = true; userDirs.enable = true;
@ -47,13 +52,4 @@
}; };
}; };
}; };
home = {
sessionVariables = {
# Default programs
EDITOR = "nvim";
TERMINAL = "st";
BROWSER = "librewolf";
};
};
} }

7
systems/laptop/java.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
jdk17
];
}

2
systems/laptop/packages.nix
View File

@ -13,7 +13,5 @@
fzf fzf
bat bat
git git
jdk17
]; ];
} }