aditya/nix-conf
1
0
Fork 0
mirror of https://git.adityakumar.xyz/nix-conf.git synced 2024-12-22 08:52:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: aditya:3a05e0b63fe194bdf1b0a477348f01aac0ca2b73
Branches Tags
aditya:master
aditya:refactor
aditya:bridge
...
compare: aditya:8cc4c190c30c17c73c2d2587955c421af7aedebe
Branches Tags
aditya:master
aditya:refactor
aditya:bridge

5 commits
3a05e0b63f ... 8cc4c190c3

Author SHA1 Message Date
Aditya
8cc4c190c3
enable wayland 2024-09-16 10:07:10 +05:30
Aditya
0955323166
disable wayland 2024-09-16 10:03:37 +05:30
Aditya
ab52a2353b
update flake 2024-09-16 09:39:07 +05:30
Aditya
aa6b45e9d5
enable nixvim 2024-09-16 09:35:27 +05:30
Aditya
5fba336e64
add nixvim 2024-09-12 23:09:24 +05:30
9 changed files with 300 additions and 19 deletions
Show stats Expand all files Collapse all files

273
flake.lock
View file

@ -22,6 +22,27 @@
"type": "github"
}
},
"devshell_2": {
"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"
}
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
@ -36,6 +57,20 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"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": [
@ -58,6 +93,27 @@
"type": "github"
}
},
"flake-parts_2": {
"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": {
"inputs": {
"systems": "systems"
@ -112,6 +168,24 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"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"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
@ -145,6 +219,36 @@
"type": "github"
}
},
"git-hooks_2": {
"inputs": {
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore_2",
"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": [
@ -168,6 +272,28 @@
"type": "github"
}
},
"gitignore_2": {
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -175,11 +301,11 @@
]
},
"locked": {
"lastModified": 1725863684,
"narHash": "sha256-HmdTBpuCsw35Ii35JUKO6AE6nae+kJliQb0XGd4hoLE=",
"lastModified": 1726440980,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "be47a2bdf278c57c2d05e747a13ed31cef54a037",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github"
},
"original": {
@ -211,6 +337,27 @@
"type": "github"
}
},
"home-manager_3": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726357542,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"master": {
"locked": {
"lastModified": 1713766410,
@ -235,11 +382,11 @@
]
},
"locked": {
"lastModified": 1726021638,
"narHash": "sha256-nnkyh02DAjbcg4w4sT+hKW77hW/tT8pQHK997wYjtUo=",
"lastModified": 1726031176,
"narHash": "sha256-wjffaTN4XQzPT3QzC63kv7DE1AjJODQwYSDQHqlQvSg=",
"owner": "akr2002",
"repo": "monitor",
"rev": "311fd173ec9fa1a71317f5d36d00de47cba2aec8",
"rev": "4b6da2e46b439ed74d5cd4334c47e028aa68b240",
"type": "github"
},
"original": {
@ -290,6 +437,27 @@
"type": "github"
}
},
"nix-darwin_2": {
"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"
}
},
"nixpkgs": {
"locked": {
"lastModified": 0,
@ -320,11 +488,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github"
},
"original": {
@ -360,6 +528,34 @@
"type": "github"
}
},
"nixvim_2": {
"inputs": {
"devshell": "devshell_2",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks_2",
"home-manager": "home-manager_3",
"nix-darwin": "nix-darwin_2",
"nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch_2",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1726441328,
"narHash": "sha256-WGZuGGjWq4Rac3MwdnXaojvTOMo2HjqXEWughqCYMAk=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "95b322a5220744a5cac725e62fa4e612851edbc2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_3",
@ -383,6 +579,28 @@
"type": "github"
}
},
"nuschtosSearch_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726392886,
"narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
"owner": "NuschtOS",
"repo": "search",
"rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"nyaa": {
"inputs": {
"nixpkgs": [
@ -410,6 +628,7 @@
"monitor": "monitor",
"neve": "neve",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim_2",
"nyaa": "nyaa"
}
},
@ -458,6 +677,21 @@
"type": "github"
}
},
"systems_4": {
"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": [
@ -479,6 +713,27 @@
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"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",

4
flake.nix
View file

@ -18,6 +18,10 @@
url = "github:akr2002/nyaa";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
neve = {
url = "github:redyf/neve";
};

4
hosts/default/home.nix
View file

@ -11,7 +11,7 @@
programs.home-manager.enable = true;
imports = [
# inputs.nixvim.homeManagerModules.nixvim
inputs.nixvim.homeManagerModules.nixvim
../../modules/home-manager
];
@ -28,7 +28,7 @@
# Manage session variables
home.sessionVariables = {
NIXPKGS_ALLOW_UNFREE = 1;
NIXOS_OZONE_WL = 1;
# NIXOS_OZONE_WL = 1;
QT_QPA_PLATFORM = "xcb";
};

1
modules/home-manager/default.nix
View file

@ -13,6 +13,7 @@
./media
./monitor
./neovim
./nixvim
./office
./session-vars
./tmux

21
modules/home-manager/nixvim/default.nix Normal file
View file

@ -0,0 +1,21 @@
{
config,
lib,
pkgs,
...
}: {
options = {
nixvim.enable = lib.mkEnableOption "enable nixvim";
};
config = lib.mkIf config.nixvim.enable {
programs.nixvim = {
enable = true;
plugins = {
};
extraPlugins = with pkgs.vimPlugins; [
ultisnips
];
};
};
}

10
modules/home-manager/session-vars/default.nix
View file

@ -11,12 +11,12 @@ _: {
# Store git credentials in KDE Wallet
GIT_ASKPASS = "/home/user/.nix-profile/bin/ksshaskpass";
WAYLAND_DISPLAY = "wayland-1";
#WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "xcb";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
#QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
#SDL_VIDEODRIVER = "wayland";
#CLUTTER_BACKEND = "wayland";
#MOZ_ENABLE_WAYLAND = "1";
DISPLAY = ":0";
};
}

2
modules/nixos/display-manager/default.nix
View file

@ -53,6 +53,6 @@
virtiofsd
];
xdg.portal.enable = true;
programs.xwayland.enable = true;
# programs.xwayland.enable = true;
};
}

2
modules/nixos/environment/default.nix
View file

@ -4,7 +4,7 @@ _: {
localBinInPath = true; # Include ~/.local/bin in $PATH
sessionVariables = {
# tell electron apps to use wayland
NIXOS_OZONE_WL = "1";
# NIXOS_OZONE_WL = "1";
};
};
}

2
modules/nixos/hyprland/default.nix
View file

@ -9,7 +9,7 @@
config = lib.mkIf config.hyprland.enable {
programs.hyprland = {
enable = true;
xwayland.enable = true;
# xwayland.enable = true;
};
};
}