annika/nixos
1
0
Fork 0
mirror of https://forgejo.merr.is/annika/nixos.git synced 2025-12-14 22:46:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: annika:59e7a61edea2e78171031f5b1d4389d893267943
Branches Tags
annika:main
..
compare: annika:b08dcb9298d98b686b64d217909bbfe2a512830e
Branches Tags
annika:main

No commits in common. "59e7a61edea2e78171031f5b1d4389d893267943" and "b08dcb9298d98b686b64d217909bbfe2a512830e" have entirely different histories.
59e7a61ede ... b08dcb9298

4 changed files with 19 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
flake.lock generated
View file

@ -24,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736437680, "lastModified": 1735048446,
"narHash": "sha256-9Sy17XguKdEU9M5peTrkWSlI/O5IAqjHzdzxbXnc30g=", "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "4d5d07d37ff773338e40a92088f45f4f88e509c8", "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736508663, "lastModified": 1735053786,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,15 +114,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732605668, "lastModified": 1729360442,
"narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"rev": "f19bd752910bbe3a861c9cad269bd078689d50fe", "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
} }
}, },
"nixpkgs": { "nixpkgs": {
@ -143,11 +143,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1734649271,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,11 +188,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1736515725, "lastModified": 1734546875,
"narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

12
hosts/kim/default.nix
View file

@ -74,7 +74,6 @@ inputs.nixpkgs.lib.nixosSystem {
# netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?) # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?)
obsidian.enable = true; obsidian.enable = true;
openrgb.enable = true; openrgb.enable = true;
orca-slicer.enable = true;
prusa-slicer.enable = true; prusa-slicer.enable = true;
spotifyd.enable = true; spotifyd.enable = true;
thunderbird.enable = true; thunderbird.enable = true;
@ -94,17 +93,8 @@ inputs.nixpkgs.lib.nixosSystem {
appimage.enable = true; appimage.enable = true;
docker.enable = true; docker.enable = true;
yubikey.enable = true; yubikey.enable = true;
kdeconnect.enable = false; kdeconnect.enable = true;
tailscale.enable = true; tailscale.enable = true;
# TODO: Move this to it's own config file
# Printer stuff
services.printing.enable = true;
services.avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
} }
]; ];
} }

11
modules/common/applications/slicers.nix
View file

@ -13,12 +13,6 @@
default = false; default = false;
}; };
}; };
orca-slicer = {
enable = lib.mkEnableOption {
description = "Enable Orca Slicer";
default = false;
};
};
}; };
config = lib.mkIf (config.gui.enable) { config = lib.mkIf (config.gui.enable) {
home-manager.users.${config.user} = lib.mkMerge [ home-manager.users.${config.user} = lib.mkMerge [
@ -33,11 +27,6 @@
pkgs.bambu-studio pkgs.bambu-studio
]; ];
}) })
(lib.mkIf (config.orca-slicer.enable) {
home.packages = [
pkgs.orca-slicer
];
})
]; ];
}; };
} }