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

Compare commits

base: aditya:5f4b7e51cd2ca1d9311025d26012f9a4a07121a1
Branches Tags
aditya:master
aditya:refactor
aditya:bridge
..
compare: aditya:91ddf2dc851b4b344602c999acde8bcea33c4007
Branches Tags
aditya:master
aditya:refactor
aditya:bridge

No commits in common. "5f4b7e51cd2ca1d9311025d26012f9a4a07121a1" and "91ddf2dc851b4b344602c999acde8bcea33c4007" have entirely different histories.
5f4b7e51cd ... 91ddf2dc85

6 changed files with 112 additions and 189 deletions
Show stats Expand all files Collapse all files

267
flake.lock
View file

@ -1,33 +1,5 @@
{ {
"nodes": { "nodes": {
"devshell": {
"inputs": {
"flake-utils": [
"neve",
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"neve",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721902368,
"narHash": "sha256-noQ5SghRPe0jzQEbFQb3fYbV6LZEzr7lIRQoxlU7fyI=",
"owner": "numtide",
"repo": "devshell",
"rev": "cf8c7405479cfde7ea4dc815e195391d2328df10",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -42,20 +14,36 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"neve", "nv",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1719994518, "lastModified": 1706830856,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,11 +57,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1709126324,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +75,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1701680307,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,54 +88,21 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"neve",
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"neve",
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"neve",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"neve", "nv",
"nixvim", "nixvim",
"git-hooks", "pre-commit-hooks",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1703887061,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720734513, "lastModified": 1715486357,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,17 +135,17 @@
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"neve", "nv",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1721852138, "lastModified": 1708988456,
"narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,40 +170,20 @@
"type": "github" "type": "github"
} }
}, },
"neve": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"nixvim": "nixvim"
},
"locked": {
"lastModified": 1722181694,
"narHash": "sha256-RNGQ6Hf3wdFvp9kR4vBv8wucpiL1pBChkUFLC1+RsDE=",
"owner": "akr2002",
"repo": "neve",
"rev": "08420902d82a0d59464459ffb43562418689a583",
"type": "github"
},
"original": {
"owner": "akr2002",
"repo": "neve",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"neve", "nv",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1721719500, "lastModified": 1709001452,
"narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", "rev": "6c06334f0843c7300d1678726bb607ce526f6b36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,25 +194,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721782431, "lastModified": 1715447595,
"narHash": "sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs=", "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f02464258baaf54992debfd010a7a3662a25536", "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1721743106,
"narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,13 +208,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1720768451, "lastModified": 1708984720,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,22 +226,19 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nuschtosSearch": "nuschtosSearch", "pre-commit-hooks": "pre-commit-hooks"
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1721946885, "lastModified": 1709155917,
"narHash": "sha256-b90iLj3d9tLz5/M8dDnhD5j9vAWjpoNn5WhCLnIwK/g=", "narHash": "sha256-S4yHqDKFmJpFQExP7bkOSw+RQaSr8pdOrfSFCOv3G70=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "47b6c4804f69556dc22aa2a2e64721f216b69090", "rev": "be87309e0c1da19d99d969625300aaed36ff1b91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,26 +247,25 @@
"type": "github" "type": "github"
} }
}, },
"nuschtosSearch": { "nv": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"neve",
"nixvim",
"nixpkgs" "nixpkgs"
] ],
"nixvim": "nixvim"
}, },
"locked": { "locked": {
"lastModified": 1721548975, "lastModified": 1712294440,
"narHash": "sha256-agCbztdk1f7nCUz03R6xdbivuBRuqubP2RHW+MNuRTg=", "narHash": "sha256-+4CR4U2jjp1GyyXubfvZIREgnp0kR65v3efUZciwlEo=",
"owner": "NuschtOS", "owner": "akr2002",
"repo": "search", "repo": "nv",
"rev": "551b031e2bc0bcc9584347a8da6312e57169661d", "rev": "937e6141a0497b2da314d2206c6a865d078d1da6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "akr2002",
"repo": "search", "repo": "nv",
"type": "github" "type": "github"
} }
}, },
@ -372,12 +289,42 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"gitignore": "gitignore",
"nixpkgs": [
"nv",
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nv",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1708018599,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"master": "master", "master": "master",
"neve": "neve", "nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_3", "nv": "nv",
"nyaa": "nyaa" "nyaa": "nyaa"
} }
}, },
@ -410,28 +357,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"neve",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721769617,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

11
flake.nix
View file

@ -6,17 +6,14 @@
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
#nv = { nv = {
# url = "github:akr2002/nv"; url = "github:akr2002/nv";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
#}; };
nyaa = { nyaa = {
url = "github:akr2002/nyaa"; url = "github:akr2002/nyaa";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
neve = {
url = "github:akr2002/neve";
};
}; };
outputs = { outputs = {

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

@ -29,7 +29,7 @@
gnome-utils.enable = lib.mkDefault false; gnome-utils.enable = lib.mkDefault false;
kde-utils.enable = lib.mkDefault true; kde-utils.enable = lib.mkDefault true;
kitty.enable = lib.mkDefault true; kitty.enable = lib.mkDefault true;
neovim.enable = lib.mkDefault false; neovim.enable = lib.mkDefault true;
tmux.enable = lib.mkDefault true; tmux.enable = lib.mkDefault true;
vscode.enable = lib.mkDefault true; vscode.enable = lib.mkDefault true;
zsh.enable = lib.mkDefault true; zsh.enable = lib.mkDefault true;

3
modules/home-manager/utils/default.nix
View file

@ -24,8 +24,7 @@
wget wget
xsel xsel
yt-dlp yt-dlp
inputs.neve.packages.${pkgs.system}.default inputs.nv.packages.x86_64-linux.default
#inputs.nv.packages.x86_64-linux.default
inputs.nyaa.packages.x86_64-linux.default inputs.nyaa.packages.x86_64-linux.default
]; ];
} }

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

@ -9,15 +9,16 @@
}; };
config = lib.mkIf config.display-manager.enable { config = lib.mkIf config.display-manager.enable {
services = { services = {
displayManager = {
sddm = {
enable = true;
wayland.enable = true;
};
};
xserver = { xserver = {
enable = true; enable = true;
displayManager = { displayManager = {
sddm = {
enable = true;
wayland = {
enable = true;
#compositor = "kwin";
};
};
gdm.enable = false; gdm.enable = false;
}; };
desktopManager = { desktopManager = {

5
modules/nixos/hardware/default.nix
View file

@ -10,9 +10,10 @@
config = lib.mkIf config.hardware.enable { config = lib.mkIf config.hardware.enable {
environment.sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; environment.sessionVariables = {LIBVA_DRIVER_NAME = "iHD";};
hardware = { hardware = {
graphics = { opengl = {
enable = true; enable = true;
enable32Bit = true; driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [vaapiIntel vaapiVdpau libvdpau-va-gl intel-media-driver intel-vaapi-driver]; extraPackages = with pkgs; [vaapiIntel vaapiVdpau libvdpau-va-gl intel-media-driver intel-vaapi-driver];
}; };
}; };