Daholli/nixos-config
1
0
Fork 0
Code Issues 5 Pull requests Actions Packages Releases Activity

Compare commits

base: Daholli:9fe3608d15b423ea04c65cc791359e63006844dc
Branches Tags
Daholli:main
...
compare: Daholli:0557daaff1a6854b8e22781db03295733bed34af
Branches Tags
Daholli:main

1 commit
9fe3608d15 ... 0557daaff1

Author SHA1 Message Date
Christoph Hollizeck 0557daaff1
rebase: fix things that I messed up during rebase 2024-11-08 01:02:04 +01:00
3 changed files with 1362 additions and 12 deletions
Show stats Expand all files Collapse all files

1362
flake.lock Normal file
View file

File diff suppressed because it is too large Load diff

4
flake.nix
View file

@ -7,11 +7,7 @@
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
<<<<<<< HEAD
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a"; nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a";
=======
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/19493dc0ad16ffd5414ac9b4e12179d0e1b98468";
>>>>>>> d1ad881e (misc forgot to commit)
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";

8
modules/nixos/desktop/addons/hyprpaper/default.nix
View file

@ -1,15 +1,7 @@
{ {
config, config,
<<<<<<< HEAD
lib, lib,
namespace, namespace,
=======
inputs,
lib,
namespace,
pkgs,
system,
>>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config)
... ...
}: }:
let let