added nixvim

This commit is contained in:
willifan 2024-09-19 17:12:09 +02:00
parent 0117839c8f
commit 0c403decf4
79 changed files with 640 additions and 255 deletions

299
flake.lock generated
View file

@ -114,6 +114,27 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -121,11 +142,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723685519, "lastModified": 1726730453,
"narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", "narHash": "sha256-Kdi7liMdbr1/uyMhMDl19O5b9LESxcnYgBRZblrJi9E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "276a0d055a720691912c6a34abb724e395c8e38a", "rev": "a31fe5ef162f2f963308289e6e27d37e3948a983",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -135,6 +156,20 @@
} }
}, },
"flake-compat": { "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-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -150,7 +185,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"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"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": [ "systems": [
"stylix", "stylix",
@ -187,6 +261,58 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1725513492,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"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"
}
},
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -211,11 +337,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720042825, "lastModified": 1726592409,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,6 +352,27 @@
} }
}, },
"home-manager_2": { "home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726825546,
"narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0b052dd8119005c6ba819db48bcc657e48f401b7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
@ -246,13 +393,34 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726188813,
"narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1723310128, "lastModified": 1726724509,
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,11 +431,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723688146, "lastModified": 1726447378,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -279,11 +447,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1726463316,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -309,6 +477,56 @@
"type": "github" "type": "github"
} }
}, },
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs-unstable"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1726846628,
"narHash": "sha256-0CH44sEwiljiN2q7eIFCvabyUm1WeEiF8ofP/z5ca0Q=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "3211ce356be612ae89a38c60799992bde8a47127",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726816132,
"narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
"owner": "NuschtOS",
"repo": "search",
"rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
@ -316,6 +534,7 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
@ -328,19 +547,19 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1725290973, "lastModified": 1726497442,
"narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", "rev": "149b313ddf91c3cc94309170498b162cec666675",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,6 +582,42 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"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",
"nixpkgs"
]
},
"locked": {
"lastModified": 1725271838,
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -22,6 +22,11 @@
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# # Secrets management. See ./docs/secretsmgmt.md # # Secrets management. See ./docs/secretsmgmt.md
# sops-nix = { # sops-nix = {
# url = "github:mic92/sops-nix"; # url = "github:mic92/sops-nix";
@ -30,9 +35,8 @@
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, stylix, ... }@attrs: outputs = { nixpkgs, nixpkgs-unstable, stylix, nixvim, ... }@attrs:
let let
system = "x86_64-linux";
lib = nixpkgs.lib; lib = nixpkgs.lib;
pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; }; pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; }; pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; };
@ -61,6 +65,8 @@
} }
attrs.disko.nixosModules.disko attrs.disko.nixosModules.disko
stylix.nixosModules.stylix stylix.nixosModules.stylix
# nixvim.homeManagerModules.nixvim
nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.framework-12th-gen-intel attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
./hosts ./hosts
./users/willifan ./users/willifan
@ -88,6 +94,7 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
} }
attrs.disko.nixosModules.disko attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
attrs.nixos-hardware.nixosModules.common-cpu-amd attrs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
# environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
virtualisation.docker = {
enable = true;
storageDriver = "btrfs";
};
}

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
networking.firewall = { networking.firewall = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, ... }: { pkgs-unstable, ... }:
{ {
services.gitea = { services.gitea = {

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { lib, ... }:
{ {
services.invidious = { services.invidious = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, ...}: { pkgs-unstable, ...}:
{ {
services.minecraft-server = { services.minecraft-server = {
eula = true; eula = true;

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.radicale = { services.radicale = {

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.syncthing = { services.syncthing = {
enable = true; enable = true;

View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
#./disko.nix #./disko.nix
]; ];
} }

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./disko.nix ./disko.nix
]; ];
} }

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
system.autoUpgrade = { system.autoUpgrade = {
enable = true; enable = true;
@ -8,4 +8,4 @@
randomizedDelaySec = "5min"; randomizedDelaySec = "5min";
fixedRandomDelay = true; fixedRandomDelay = true;
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, hostname, ... }: { hostname, ... }:
{ {
imports = [ imports = [
./autoupdate.nix ./autoupdate.nix

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
nix.gc = { nix.gc = {
automatic = true; automatic = true;
@ -6,4 +6,4 @@
persistent = true; persistent = true;
options = "--delete-older-than 10d"; options = "--delete-older-than 10d";
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { ... }:
{ {
nix.optimise = { nix.optimise = {
automatic = true; automatic = true;
dates = [ "05:00" ]; dates = [ "05:00" ];
}; };
} }

View file

@ -1,8 +1,8 @@
{ pkgs, hostname, type, ... }: { hostname, type, ... }:
{ {
imports = [ imports = [
./common ./common
./${type} ./${type}
./${hostname} ./${hostname}
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, hostname, ... }: { hostname, ... }:
{ {
networking.hostName = hostname; networking.hostName = hostname;
imports = [ imports = [

View file

@ -3,10 +3,5 @@
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = with pkgs; [
# Add any missing dynamic libraries for unpackaged programs
# here, NOT in environment.systemPackages
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.syncthing = { services.syncthing = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.openssh = { services.openssh = {
@ -17,4 +17,4 @@
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMRriQfw3pusl04fGhCNVoRRpye71ZwkDXAtKB/FP1DLXA4cYrwjLzv/fG1hXi7lAMp2vLiABAg/UaTE8roGzlt62XsFNwc1TI5M8m67J0kLkCtz3MkIixe/3GOFXr03g80DPncLyoIYPvvNd/TftTBK4yrrZPvMJaRrZhW/QdLPQpdHalcNRZ4bnBOCtCoqQ6RGrRi2EeKaJDYIFNl13b9FxrXEJcXnbSDdr1KI3q7a+vkefI2knUf2Uk7ufOWTQ1aqc0heGtCNlHzwZUzW/dfrpPmoVPq3Fqxqd9uXqxMk1Z3VnOwWcK3VXfzzBXKTsX0MaUgF1EqxibkYs9bDZqLEXoRucBqk3wwMPy8RJXqQOupoqa2xEOoduBf1qDHEEm69coHCpPm2mQVUrwsPrmTHmOjh9ir0mkVBDRgHvhq/ctQTVO5/SE2NCgPdlvUV5s44LLsUyxBp5JWwXZWlVys+7Dhil6mtRDcH4CXceJn0VZ61Zv2jrCTxQjKsroitSkNbpAkKajQ9moLMAblsSwJzl3uvJJ3ydlxjZefwTO/GjyuJMY2sIU2Tu0YbIVgMyq5L782LduVlyWj+RLWoEu19OfMqQvTWhJnQPAbR82qGzlfTGRLUxoY+G5MYipJwgrBQ2TnpWvfpTrZxFrglSfekz0v54lWzNZpW+irImh4w== willifan@proton.me" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMRriQfw3pusl04fGhCNVoRRpye71ZwkDXAtKB/FP1DLXA4cYrwjLzv/fG1hXi7lAMp2vLiABAg/UaTE8roGzlt62XsFNwc1TI5M8m67J0kLkCtz3MkIixe/3GOFXr03g80DPncLyoIYPvvNd/TftTBK4yrrZPvMJaRrZhW/QdLPQpdHalcNRZ4bnBOCtCoqQ6RGrRi2EeKaJDYIFNl13b9FxrXEJcXnbSDdr1KI3q7a+vkefI2knUf2Uk7ufOWTQ1aqc0heGtCNlHzwZUzW/dfrpPmoVPq3Fqxqd9uXqxMk1Z3VnOwWcK3VXfzzBXKTsX0MaUgF1EqxibkYs9bDZqLEXoRucBqk3wwMPy8RJXqQOupoqa2xEOoduBf1qDHEEm69coHCpPm2mQVUrwsPrmTHmOjh9ir0mkVBDRgHvhq/ctQTVO5/SE2NCgPdlvUV5s44LLsUyxBp5JWwXZWlVys+7Dhil6mtRDcH4CXceJn0VZ61Zv2jrCTxQjKsroitSkNbpAkKajQ9moLMAblsSwJzl3uvJJ3ydlxjZefwTO/GjyuJMY2sIU2Tu0YbIVgMyq5L782LduVlyWj+RLWoEu19OfMqQvTWhJnQPAbR82qGzlfTGRLUxoY+G5MYipJwgrBQ2TnpWvfpTrZxFrglSfekz0v54lWzNZpW+irImh4w== willifan@proton.me"
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.auto-cpufreq = { services.auto-cpufreq = {
enable = true; enable = true;
@ -13,4 +13,4 @@
}; };
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
./auto-cpufreq.nix ./auto-cpufreq.nix
./backlight.nix ./backlight.nix
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
} }

View file

@ -1,10 +1,11 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
imports = [ imports = [
./envvar.nix ./envvar.nix
./git.nix ./git.nix
./hyfetch.nix ./hyfetch.nix
./locales.nix ./locales.nix
./nixvim
#./ssh.nix #./ssh.nix
./user.nix ./user.nix
./zsh.nix ./zsh.nix

View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { ... }:
{ {
environment.sessionVariables = rec { environment.sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
XDG_CACHE_HOME = "$HOME/.cache"; XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config"; XDG_CONFIG_HOME = "$HOME/.config";
@ -13,4 +13,4 @@
# "${XDG_BIN_HOME}" # "${XDG_BIN_HOME}"
#]; #];
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { pkgs, ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
programs.git = { programs.git = {
@ -11,4 +11,4 @@
}; };
}; };
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@ -13,4 +13,4 @@
LC_TELEPHONE = "de_DE.UTF-8"; LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8";
}; };
} }

View file

@ -0,0 +1,17 @@
{ ... }:
{
programs.nixvim = {
enable = true;
};
imports = [
./gitsigns.nix
./illuminate.nix
./lsp.nix
./navic.nix
./neotree.nix
./toggleterm.nix
];
}

View file

@ -0,0 +1,28 @@
{ ... }:
{
programs.nixvim.plugins.gitsigns = {
enable = true;
settings = {
signs = {
add = {
text = " ";
};
change = {
text = " ";
};
delete = {
text = " ";
};
untracked = {
text = "";
};
topdelete = {
text = "󱂥 ";
};
changedelete = {
text = "󱂧 ";
};
};
};
};
}

View file

@ -0,0 +1,18 @@
{ ... }:
{
programs.nixvim.plugins = {
illuminate = {
enable = true;
underCursor = false;
filetypesDenylist = [
"Outline"
"TelescopePrompt"
"alpha"
"harpoon"
"reason"
];
};
};
}

View file

@ -0,0 +1,99 @@
{ ... }:
{
programs.nixvim = {
plugins = {
lsp-lines = {enable = true;};
lsp-format = {enable = true;};
helm = {enable = true;};
lsp = {
enable = true;
inlayHints = true;
servers = {
html = {enable = true;};
lua-ls = {enable = true;};
nil-ls = {enable = true;};
marksman = {enable = true;};
nixd = {enable = true;};
pyright = {enable = true;};
gopls = {enable = true;};
terraformls = {enable = true;};
ansiblels = {enable = true;};
jsonls = {enable = true;};
yamlls = {
enable = true;
extraOptions = {
settings = {
yaml = {
schemas = {
kubernetes = "'*.yaml";
"http://json.schemastore.org/github-workflow" = ".github/workflows/*";
"http://json.schemastore.org/github-action" = ".github/action.{yml,yaml}";
"http://json.schemastore.org/ansible-stable-2.9" = "roles/tasks/*.{yml,yaml}";
"http://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}";
"http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}";
"http://json.schemastore.org/chart" = "Chart.{yml,yaml}";
"https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}";
"https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}";
"https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}";
};
};
};
};
};
};
keymaps = {
silent = true;
lspBuf = {
gd = {
action = "definition";
desc = "Goto Definition";
};
gr = {
action = "references";
desc = "Goto References";
};
gD = {
action = "declaration";
desc = "Goto Declaration";
};
gI = {
action = "implementation";
desc = "Goto Implementation";
};
gT = {
action = "type_definition";
desc = "Type Definition";
};
K = {
action = "hover";
desc = "Hover";
};
"<leader>cw" = {
action = "workspace_symbol";
desc = "Workspace Symbol";
};
"<leader>cr" = {
action = "rename";
desc = "Rename";
};
};
diagnostic = {
"<leader>cd" = {
action = "open_float";
desc = "Line Diagnostics";
};
"[d" = {
action = "goto_next";
desc = "Next Diagnostic";
};
"]d" = {
action = "goto_prev";
desc = "Previous Diagnostic";
};
};
};
};
};
};
}

View file

@ -0,0 +1,42 @@
{ ... }:
{
programs.nixvim.plugins = {
navic = {
enable = true;
settings = {
separator = " ";
highlight = true;
lsp = {
autoAttach = true;
};
icons = {
Array = "󱃵 ";
Boolean = " ";
Class = " ";
Constant = " ";
Constructor = " ";
Enum = " ";
EnumMember = " ";
Event = " ";
Field = "󰽏 ";
File = " ";
Function = "󰡱 ";
Interface = " ";
Key = " ";
Method = " ";
Module = "󰕳 ";
Namespace = " ";
Null = "󰟢 ";
Number = " ";
Object = " ";
Operator = " ";
Package = "󰏖 ";
String = " ";
Struct = " ";
TypeParameter = " ";
Variable = " ";
};
};
};
};
}

View file

@ -0,0 +1,42 @@
{ ... }:
{
programs.nixvim = {
plugins = {
neo-tree = {
enable = true;
sources = ["filesystem" "buffers" "git_status" "document_symbols"];
addBlankLineAtTop = false;
filesystem = {
bindToCwd = false;
followCurrentFile = {
enabled = true;
};
};
defaultComponentConfigs = {
indent = {
withExpanders = true;
expanderCollapsed = "󰅂";
expanderExpanded = "󰅀";
expanderHighlight = "NeoTreeExpander";
};
gitStatus = {
symbols = {
added = " ";
conflict = "󰩌 ";
deleted = "󱂥";
ignored = " ";
modified = " ";
renamed = "󰑕";
staged = "󰩍";
unstaged = "";
untracked = " ";
};
};
};
};
};
};
}

View file

@ -0,0 +1,11 @@
{ ... }:
{
programs.nixvim.plugins = {
toggleterm = {
enable = true;
settings = {
size = 10;
};
};
};
}

View file

@ -1,6 +1,6 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
}; };
} }

View file

@ -1,10 +1,9 @@
{ pkgs, ... }: { ... }:
{ {
users.users.willifan = { users.users.willifan = {
isNormalUser = true; isNormalUser = true;
description = "willifan"; description = "willifan";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [];
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, hostname, type, ... }: { hostname, type, ... }:
{ {
imports = [ imports = [
./common ./common

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.greetd = { services.greetd = {
enable = true; enable = true;
@ -10,4 +10,4 @@
default_session = initial_session; default_session = initial_session;
}; };
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
services.udev.extraRules = '' services.udev.extraRules = ''

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { pkgs, ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {

View file

@ -11,7 +11,7 @@
services.ratbagd = { services.ratbagd = {
enable = true; enable = true;
package = pkgs.libratbag.overrideAttrs (previousAttrs: rec { package = pkgs.libratbag.overrideAttrs (previousAttrs: {
postInstall = '' postInstall = ''
# Ensure the target directory exists # Ensure the target directory exists
mkdir -p $out/share/libratbag/ mkdir -p $out/share/libratbag/
@ -34,4 +34,4 @@ EOF
''; '';
}); });
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,6 +1,6 @@
{ pkgs, homa-manager, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
mangohud mangohud
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
programs.steam = { programs.steam = {
enable = true; enable = true;
@ -13,4 +13,4 @@
SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess" SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
''; '';
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
programs.hyprland.enable = true; programs.hyprland.enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ...}: { pkgs, ...}:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

View file

@ -1,14 +1,10 @@
{ pkgs, home-manager, ...}: { ...}:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
# preload = "/home/willifan/.config/desktop-utils/images/Bob Ross.png";
# wallpaper = ",/home/willifan/.config/desktop-utils/images/Bob Ross.png";
splash = true; splash = true;
ipc = "off"; ipc = "off";
@ -16,4 +12,4 @@
}; };
}; };
}; };
} }

View file

@ -1,13 +1,11 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
services.mako = { services.mako = {
enable = true; enable = true;
# backgroundColor = "#191724bb";
# borderColor = "#ffa44bee";
borderRadius = 10; borderRadius = 10;
borderSize = 2; borderSize = 2;
}; };
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
@ -10,4 +10,4 @@
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -19,4 +19,4 @@
papirus-icon-theme papirus-icon-theme
eww eww
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ...}: { ...}:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
programs.wlogout = { programs.wlogout = {
@ -80,4 +80,4 @@
''; '';
}; };
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
programs.wofi = { programs.wofi = {
@ -9,11 +9,6 @@
halign = "fill"; halign = "fill";
}; };
# style = ''
# window {
# border-radius: 10px;
# }
# '';
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, hostname, ... }: { hostname, ... }:
{ {
imports = [ imports = [
./common ./common
./${hostname} ./${hostname}
]; ];
} }

View file

@ -1,16 +1,11 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
# font = {
# name = "HackNerdFontMono-Regular";
# package =pkgs.nerdfonts;
# };
settings = { settings = {
# background_opacity = "0.85";
enable_audio_bell = false; enable_audio_bell = false;
}; };
}; };
}; };
} }

View file

@ -1,17 +0,0 @@
{ pkgs, home-manager, ... }:
{
environment.sessionVariables = {
XCURSOR_SIZE = "18";
HYPRCURSOR_SIZE = "18";
};
home-manager.users.willifan = {
home.pointerCursor = {
gtk.enable = true;
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 18;
};
};
}

View file

@ -1,11 +1,7 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
#./cursor.nix
#./font.nix
#./gtk.nix
#./qt.nix
./stylix.nix ./stylix.nix
]; ];
} }

View file

@ -1,14 +0,0 @@
{ pkgs, home-manager, ...}:
{
home-manager.users.willifan = {
fonts.fontconfig = {
enable = true;
defaultFonts = {
monospace = [ "JetBrains Mono" ];
serif = [ "" ];
sansSerif = [ "" ];
emoji = [ "" ];
};
};
};
}

View file

@ -1,46 +0,0 @@
{ pkgs, home-manager, ... }:
{
home-manager.users.willifan = {
gtk = {
enable = true;
font = {
name = "JetBrains Mono";
package = pkgs.jetbrains-mono;
};
theme = {
name = "rose-pine";
package = pkgs.rose-pine-gtk-theme;
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
};
#TODO add ascendancy cursor pack
#cursortTheme.name = "";
#cursortTheme.package = ;
gtk3.extraConfig = {
Settings = ''
gtk-application-prefer-dark-theme=1
'';
};
gtk4 = {
extraConfig = {
Settings = ''
gtk-application-prefer-dark-theme=1
'';
};
extraCss = ''
.sidebar-pane {
background-color: rgb(25, 23, 36);
}
'';
};
};
};
}

View file

@ -1,23 +0,0 @@
{ pkgs, home-manager, ... }:
{
environment.systemPackages = with pkgs; [
qalculate-qt
];
home-manager.users.willifan = {
qt = {
enable = true;
style = {
name = "gtk2";
package = pkgs.libsForQt5.qtstyleplugins;
};
platformTheme.name = "gtk";
};
};
#qt = {
# enable = true;
# platformTheme = "gtk2";
# style = "gtk2";
# };
}

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { pkgs, ... }:
{ {
stylix = { stylix = {

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { pkgs, ... }:
{ {
services.gvfs.enable = true; services.gvfs.enable = true;
@ -16,4 +16,4 @@
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
imports = [ imports = [
@ -8,4 +8,4 @@
]; ];
} }

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
programs.firefox = { programs.firefox = {

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }: { ... }:
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
programs.thunderbird = { programs.thunderbird = {

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
} }