liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

fix: merge conflicts

Browse source
This commit is contained in:
Ahwx 2024-07-28 13:54:49 +02:00
commit 4eccd5bfac
8 changed files with 430 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

344
flake.lock generated
View file

@ -52,6 +52,51 @@
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"owner": "numtide",
"repo": "devshell",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
@ -74,6 +119,20 @@
"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": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -92,6 +151,64 @@
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakeCompat": {
"flake": false,
"locked": {
@ -108,6 +225,62 @@
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"nixvim",
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720524665,
"narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"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": {
"inputs": {
"nixpkgs": [
@ -128,6 +301,28 @@
"type": "github"
}
},
"home-manager_3": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720734513,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hypr-contrib": {
"inputs": {
"nixpkgs": "nixpkgs_2"
@ -345,6 +540,28 @@
"url": "https://iceshrimp.dev/iceshrimp/packaging"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720845312,
"narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
@ -392,6 +609,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1719876945,
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712163089,
@ -472,6 +701,83 @@
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1720768451,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_7",
"nixvim": "nixvim_2"
},
"locked": {
"lastModified": 1721648522,
"narHash": "sha256-G5s2VV9tVMaqI7Bgqf4DWPzImqwHBqWi6XeJsPipM38=",
"owner": "ahwxorg",
"repo": "nixvim-config",
"rev": "9cacf44f8915fd4d1e8107a16afac3ceaae63b84",
"type": "github"
},
"original": {
"owner": "ahwxorg",
"repo": "nixvim-config",
"type": "github"
}
},
"nixvim_2": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_3",
"git-hooks": "git-hooks",
"home-manager": "home-manager_3",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_8",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721592379,
"narHash": "sha256-pJzkjy4+sM9+5IfrZMTWAiB0m/m4eiV4fmnqxtVNonI=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "d2f733efb4962903b77af330c4c03a63f2f72968",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1721032588,
@ -499,6 +805,7 @@
"iceshrimp": "iceshrimp",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_6",
"nixvim": "nixvim",
"nur": "nur"
}
},
@ -534,6 +841,43 @@
"type": "github"
}
},
"systems_3": {
"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": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720818892,
"narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",

2
flake.nix
View file

@ -5,6 +5,8 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
nixvim.url = "github:ahwxorg/nixvim-config";
hypr-contrib.url = "github:hyprwm/contrib";
hyprpicker.url = "github:hyprwm/hyprpicker";

19
modules/core/default.nix
View file

@ -1,20 +1,19 @@
{ ... }:
{
imports =
# [(import ./bootloader.nix)]
[(import ./hardware.nix)]
# ++ [(import ./xserver.nix)]
[(import ./bootloader.nix)]
++ [(import ./hardware.nix)]
++ [(import ./xserver.nix)]
++ [(import ./network.nix)]
# ++ [(import ./pipewire.nix)]
++ [(import ./pipewire.nix)]
++ [(import ./program.nix)]
++ [(import ./sshd.nix)]
++ [(import ./security.nix)]
++ [(import ./services.nix)]
++ [(import ./system.nix)]
++ [(import ./wireguard.nix)]
++ [(import ./user.nix)];
# ++ [(import ./bluetooth.nix)]
# ++ [(import ./yubikey.nix)]
# ++ [(import ./steam.nix)]
# ++ [(import ./wayland.nix)];
++ [(import ./user.nix)]
++ [(import ./bluetooth.nix)]
++ [(import ./yubikey.nix)]
++ [(import ./steam.nix)]
++ [(import ./wayland.nix)];
}

2
modules/core/yubikey.nix
View file

@ -7,7 +7,7 @@
security.pam = {
u2f = {
enable = true;
cue = true;
settings.cue = true;
control = "sufficient";
};

4
modules/home/nvim.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }:
{
programs.neovim = {
enable = true;
vimAlias = true;
enable = false;
vimAlias = false;
};
}

3
modules/home/packages.nix
View file

@ -1,6 +1,7 @@
{ inputs, pkgs, ... }:
{
home.packages = with pkgs; [
translate-shell # Google Translate but in the CLI
wireguard-tools # VPN connections
openresolv # required for wireguard-tools
pwgen
@ -29,6 +30,7 @@
wineWowPackages.wayland
element-desktop-wayland
tut
iamb
spotify
thunderbird
neofetch
@ -58,5 +60,6 @@
xdg-utils
xxd
inputs.alejandra.defaultPackage.${system}
inputs.nixvim.packages.${pkgs.system}.default
];
}

1
modules/home/packages.violet.nix
View file

@ -29,5 +29,6 @@
wget
xxd
inputs.alejandra.defaultPackage.${system}
inputs.nixvim.defaultPackage.${system}
];
}

69
modules/home/zsh.nix
View file

@ -25,6 +25,72 @@
HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE = 1;
};
initExtra = ''
autoload -U add-zsh-hook
autoload -U compinit
zmodload zsh/complist
autoload -U edit-command-line
zmodload zsh/zpty
# Corrections
setopt correct
# History stuff
setopt append_history
setopt inc_append_history
setopt share_history
setopt extended_history
setopt hist_reduce_blanks
setopt hist_ignore_space
# Disable annoying beep
setopt no_beep
# Fix comments
setopt interactive_comments
bindkey '^[[H' beginning-of-line # Home
bindkey '^[[F' end-of-line # End
bindkey "^[[1;5C" forward-word # Ctrl+Right
bindkey "^[[1;5D" backward-word # Ctrl+Left
# Menu selection
bindkey -M menuselect '^@' accept-and-infer-next-history # Ctrl+Space
# Make Alt-Backspace delete till ~!#$%^&*(){}[]<>?+; the way OMZ does
backward-delete-word-but-better () {
local WORDCHARS='~!#$%^&*(){}[]<>?+;'
zle backward-delete-word
}
zle -N backward-delete-word-but-better
bindkey '\e^?' backward-delete-word-but-better
# Completions
#
# Cache so it's a bit quicker
zstyle ':completion:*' use-cache on
zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
# File list like ls -l
zstyle ':completion:*' file-list all
# Glorious menu
zstyle ':completion:*' menu select
# Always tab complete
zstyle ':completion:*' insert-tab false
# Comments
zstyle ':completion:*' verbose yes
# Tab key behaviour
zstyle ':autocomplete:tab:*' widget-style menu-complete
# Make set // to be / instead of default /*/
zstyle ':completion:*' squeeze-slashes true
# Complete options
zstyle ':completion:*' complete-options true
# Complete partial words (such as 3912 > _DSC3912.JPG)
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
# Move around completion menu with Vi keys
bindkey -M menuselect 'h' vi-backward-char
bindkey -M menuselect 'k' vi-up-line-or-history
bindkey -M menuselect 'j' vi-down-line-or-history
bindkey -M menuselect 'l' vi-forward-char
'';
# setOptions = [
# # Corrections
# "CORRECT"
@ -54,7 +120,8 @@
yt-dlp-audio = "yt-dlp -f 'ba' -x --audio-format mp3";
open = "xdg-open";
tree = "eza --icons --tree --group-directories-first";
nvim = "nix run /home/liv/Development/nixvim --";
# nvim = "nix run /home/liv/Development/nixvim --";
vim = "nvim";
doas = "sudo";
# NixOS