Compare commits
2 commits
4d153acf8e
...
104d2ce32d
| Author | SHA1 | Date | |
|---|---|---|---|
| 104d2ce32d | |||
| 6269ee3943 |
11 changed files with 85 additions and 100 deletions
22
flake.lock
generated
22
flake.lock
generated
|
|
@ -15,27 +15,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"disko": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1746728054,
|
|
||||||
"narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "disko",
|
|
||||||
"rev": "ff442f5d1425feb86344c028298548024f21256d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "latest",
|
|
||||||
"repo": "disko",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -315,7 +294,6 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"disko": "disko",
|
|
||||||
"jovian": "jovian",
|
"jovian": "jovian",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,12 @@
|
||||||
lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
|
lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-darwin.url = "github:LnL7/nix-darwin";
|
nix-darwin.url = "github:LnL7/nix-darwin";
|
||||||
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
disko.url = "github:nix-community/disko/latest";
|
|
||||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
|
jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
|
||||||
jovian.inputs.nixpkgs.follows = "nixpkgs";
|
jovian.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, lanzaboote, nix-darwin, disko, jovian, nix-minecraft, ... }@inputs: {
|
outputs = { self, nixpkgs, lanzaboote, nix-darwin, jovian, nix-minecraft, ... }@inputs: {
|
||||||
nixosConfigurations.nijika = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.nijika = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
|
@ -58,7 +56,6 @@
|
||||||
lanzaboote.nixosModules.lanzaboote
|
lanzaboote.nixosModules.lanzaboote
|
||||||
|
|
||||||
./hosts/nijika/configuration.nix
|
./hosts/nijika/configuration.nix
|
||||||
disko.nixosModules.disko
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -82,7 +79,6 @@
|
||||||
|
|
||||||
./hosts/miki/configuration.nix
|
./hosts/miki/configuration.nix
|
||||||
./hosts/nixos-common.nix
|
./hosts/nixos-common.nix
|
||||||
disko.nixosModules.disko
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./disko.nix
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
disko.devices = {
|
|
||||||
disk = {
|
|
||||||
main = {
|
|
||||||
type = "disk";
|
|
||||||
device = "/dev/nvme0n1";
|
|
||||||
content = {
|
|
||||||
type = "gpt";
|
|
||||||
partitions = {
|
|
||||||
ESP = {
|
|
||||||
size = "512M";
|
|
||||||
type = "EF00";
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "vfat";
|
|
||||||
mountpoint = "/boot";
|
|
||||||
mountOptions = [ "umask=0077" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
luks = {
|
|
||||||
size = "100%";
|
|
||||||
content = {
|
|
||||||
type = "luks";
|
|
||||||
name = "root";
|
|
||||||
passwordFile = "/tmp/secret.key";
|
|
||||||
settings = {
|
|
||||||
allowDiscards = true;
|
|
||||||
};
|
|
||||||
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
|
|
||||||
content = {
|
|
||||||
type = "btrfs";
|
|
||||||
extraArgs = [ "-f" ];
|
|
||||||
subvolumes = {
|
|
||||||
"/root" = {
|
|
||||||
mountpoint = "/";
|
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
|
||||||
};
|
|
||||||
"/home" = {
|
|
||||||
mountpoint = "/home";
|
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
|
||||||
};
|
|
||||||
"/nix" = {
|
|
||||||
mountpoint = "/nix";
|
|
||||||
mountOptions = [ "compress=zstd" "noatime" ];
|
|
||||||
};
|
|
||||||
"/swap" = {
|
|
||||||
mountpoint = "/.swapvol";
|
|
||||||
swap.swapfile.size = "1G";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -8,17 +8,44 @@
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
fileSystems."/" =
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
{ device = "/dev/mapper/root";
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
fsType = "btrfs";
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
options = [ "subvol=root" ];
|
||||||
networking.useDHCP = lib.mkDefault true;
|
};
|
||||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
|
||||||
|
boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/4a0361b6-b3b4-48dd-a089-babdfa072fc2";
|
||||||
|
|
||||||
|
fileSystems."/nix" =
|
||||||
|
{ device = "/dev/mapper/root";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=nix" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/.swapvol" =
|
||||||
|
{ device = "/dev/mapper/root";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=swap" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" =
|
||||||
|
{ device = "/dev/mapper/root";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=home" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/1653-F2C8";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
brightnessctl
|
brightnessctl
|
||||||
helvum
|
helvum
|
||||||
walker
|
fuzzel
|
||||||
playerctl
|
playerctl
|
||||||
swaynotificationcenter
|
swaynotificationcenter
|
||||||
hyprshot
|
hyprshot
|
||||||
|
|
|
||||||
1
stow/.config/fuzzel/.gitignore
vendored
Normal file
1
stow/.config/fuzzel/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
colors.ini
|
||||||
24
stow/.config/fuzzel/fuzzel.ini
Normal file
24
stow/.config/fuzzel/fuzzel.ini
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
[main]
|
||||||
|
include = "~/.config/fuzzel/colors.ini"
|
||||||
|
|
||||||
|
prompt="> "
|
||||||
|
placeholder="Search..."
|
||||||
|
password-character="*"
|
||||||
|
|
||||||
|
width=40
|
||||||
|
use-bold=no
|
||||||
|
dpi-aware=auto
|
||||||
|
tabs="4"
|
||||||
|
terminal="ghostty -e"
|
||||||
|
keyboard-focus=exclusive
|
||||||
|
|
||||||
|
fields=filename,name,generic,exec,keywords,comment,categories
|
||||||
|
match-mode="fzf"
|
||||||
|
sort-result=yes
|
||||||
|
|
||||||
|
layer=top
|
||||||
|
|
||||||
|
[border]
|
||||||
|
width=2
|
||||||
|
radius=10
|
||||||
|
selection-radius=10
|
||||||
|
|
@ -17,7 +17,6 @@ exec-once = uwsm app -- swww-daemon
|
||||||
exec-once = uwsm app -- waybar
|
exec-once = uwsm app -- waybar
|
||||||
exec-once = uwsm app -- swaync
|
exec-once = uwsm app -- swaync
|
||||||
exec-once = hyprshade auto
|
exec-once = hyprshade auto
|
||||||
exec-once = walker -A
|
|
||||||
|
|
||||||
exec-once = uwsm app -- opensnitch-ui
|
exec-once = uwsm app -- opensnitch-ui
|
||||||
exec-once = systemctl --user start hyprpolkitagent
|
exec-once = systemctl --user start hyprpolkitagent
|
||||||
|
|
@ -146,7 +145,7 @@ input {
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#gestures
|
# https://wiki.hyprland.org/Configuring/Variables/#gestures
|
||||||
gesture = 3, horizontal, workspace
|
gesture = 3, horizontal, workspace
|
||||||
gesture = 4, pinch, dispatcher, exec, walker
|
gesture = 4, pinch, dispatcher, exec, fuzzel
|
||||||
gesture = 4, left, dispatcher, exec, swaync-client -op
|
gesture = 4, left, dispatcher, exec, swaync-client -op
|
||||||
gesture = 4, right, dispatcher, exec, swaync-client -cp
|
gesture = 4, right, dispatcher, exec, swaync-client -cp
|
||||||
|
|
||||||
|
|
@ -168,7 +167,7 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
|
||||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||||
bind = $mainMod, Q, exec, uwsm app -- ghostty
|
bind = $mainMod, Q, exec, uwsm app -- ghostty
|
||||||
bind = $mainMod, B, exec, uwsm app -- firefox
|
bind = $mainMod, B, exec, uwsm app -- firefox
|
||||||
bind = $mainMod, D, exec, walker
|
bind = $mainMod, D, exec, fuzzel
|
||||||
bind = $mainMod shift, D, exec, uwsm app -- 1password --quick-access
|
bind = $mainMod shift, D, exec, uwsm app -- 1password --quick-access
|
||||||
bind = $mainMod, S, exec, uwsm app -- hyprshot -z --clipboard-only -m region
|
bind = $mainMod, S, exec, uwsm app -- hyprshot -z --clipboard-only -m region
|
||||||
bind = $mainMod shift, S, exec, uwsm app -- hyprshot -z --clipboard-only -m window
|
bind = $mainMod shift, S, exec, uwsm app -- hyprshot -z --clipboard-only -m window
|
||||||
|
|
|
||||||
|
|
@ -72,3 +72,7 @@ output_path = '~/.cache/zsh_colours.sh'
|
||||||
input_path = './templates/pure.fish'
|
input_path = './templates/pure.fish'
|
||||||
output_path = '~/.config/fish/pure_colours.fish'
|
output_path = '~/.config/fish/pure_colours.fish'
|
||||||
post_hook = 'fish ~/.config/fish/pure_colours.fish'
|
post_hook = 'fish ~/.config/fish/pure_colours.fish'
|
||||||
|
|
||||||
|
[templates.fuzzel]
|
||||||
|
input_path = './templates/fuzzel.ini'
|
||||||
|
output_path = '~/.config/fuzzel/colors.ini'
|
||||||
|
|
|
||||||
18
stow/.config/matugen/templates/fuzzel.ini
Normal file
18
stow/.config/matugen/templates/fuzzel.ini
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Fuzzel Colors
|
||||||
|
# Generated with Matugen
|
||||||
|
|
||||||
|
[main]
|
||||||
|
font=ComicShannsMono Nerd Font
|
||||||
|
|
||||||
|
[colors]
|
||||||
|
background={{colors.background.default.hex_stripped}}ff
|
||||||
|
text={{colors.on_surface.default.hex_stripped}}ff
|
||||||
|
prompt={{colors.secondary.default.hex_stripped}}ff
|
||||||
|
placeholder={{colors.tertiary.default.hex_stripped}}ff
|
||||||
|
input={{colors.primary.default.hex_stripped}}ff
|
||||||
|
match={{colors.tertiary.default.hex_stripped}}ff
|
||||||
|
selection={{colors.primary.default.hex_stripped}}ff
|
||||||
|
selection-text={{colors.background.default.hex_stripped}}ff
|
||||||
|
selection-match={{colors.on_primary.default.hex_stripped}}ff
|
||||||
|
counter={{colors.secondary.default.hex_stripped}}ff
|
||||||
|
border={{colors.primary.default.hex_stripped}}ff
|
||||||
Loading…
Add table
Add a link
Reference in a new issue