Compare commits

...

6 Commits

11 changed files with 153 additions and 38 deletions
+2
View File
@@ -1,12 +1,14 @@
keys: keys:
- &katana age18ujjw92tm6vpcpgqqky7dzg3yvzm9nytgzeptkfhtz5jhdskcdpsgmv0vs - &katana age18ujjw92tm6vpcpgqqky7dzg3yvzm9nytgzeptkfhtz5jhdskcdpsgmv0vs
- &bomba age1ynu6zhhy84rr5xqce0flp25x5tnfgskesxfe39u7ewsk900fvagq9sq0lx - &bomba age1ynu6zhhy84rr5xqce0flp25x5tnfgskesxfe39u7ewsk900fvagq9sq0lx
- &frog age1xfr76wj2hzz9mkxxce5qxgr2n72zsypatzhgl2fxgsh408wdzsaq39wt9z
creation_rules: creation_rules:
- path_regex: secrets/default.sops.yaml - path_regex: secrets/default.sops.yaml
key_groups: key_groups:
- age: - age:
- *katana - *katana
- *bomba - *bomba
- *frog
- path_regex: secrets/bomba.sops.yaml - path_regex: secrets/bomba.sops.yaml
key_groups: key_groups:
- age: - age:
Generated
+17
View File
@@ -235,6 +235,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-my-features": {
"locked": {
"lastModified": 1779912664,
"narHash": "sha256-OtD0RA+zI3a5BE/g6IgflMf8DiwdKIJ2S2P4k7ww3AI=",
"owner": "Superredstone",
"repo": "nixpkgs",
"rev": "4788847e7c2deefd8c9a7369af552a1d9e9964d1",
"type": "github"
},
"original": {
"owner": "Superredstone",
"ref": "my-features",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1779508470, "lastModified": 1779508470,
@@ -372,6 +388,7 @@
"nixflix": "nixflix", "nixflix": "nixflix",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-25-11": "nixpkgs-25-11", "nixpkgs-25-11": "nixpkgs-25-11",
"nixpkgs-my-features": "nixpkgs-my-features",
"nixvim": "nixvim", "nixvim": "nixvim",
"noctalia": "noctalia", "noctalia": "noctalia",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
+11
View File
@@ -2,6 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-25-11.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-25-11.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-my-features.url = "github:Superredstone/nixpkgs/my-features";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -29,6 +30,7 @@
{ {
nixpkgs, nixpkgs,
nixpkgs-25-11, nixpkgs-25-11,
nixpkgs-my-features,
home-manager, home-manager,
nixvim, nixvim,
sops-nix, sops-nix,
@@ -52,6 +54,7 @@
inputs inputs
nixpkgs nixpkgs
nixpkgs-25-11 nixpkgs-25-11
nixpkgs-my-features
home-manager home-manager
; ;
}; };
@@ -86,5 +89,13 @@
nixflix.nixosModules.default nixflix.nixosModules.default
]; ];
}; };
nixosConfigurations."frog" = mkSystem "frog" {
system = "x86_64-linux";
user = username;
email = personalEmail;
workSystem = true;
desktopEnvironment = "gnome";
enableZram = true;
};
}; };
} }
+1
View File
@@ -12,6 +12,7 @@
init.defaultBranch = "main"; init.defaultBranch = "main";
pull.rebase = true; pull.rebase = true;
commit.gpgsign = true; commit.gpgsign = true;
push.autoSetupRemote = true;
}; };
}; };
} }
+2
View File
@@ -7,6 +7,7 @@
inputs, inputs,
nixpkgs, nixpkgs,
nixpkgs-25-11, nixpkgs-25-11,
nixpkgs-my-features,
home-manager, home-manager,
}: }:
name: name:
@@ -32,6 +33,7 @@ let
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-25-11 = nixpkgs-25-11.legacyPackages.${system}; pkgs-25-11 = nixpkgs-25-11.legacyPackages.${system};
pkgs-my-features = nixpkgs-my-features.legacyPackages.${system};
currentSystem = system; currentSystem = system;
currentSystemName = name; currentSystemName = name;
currentSystemUser = user; currentSystemUser = user;
+3 -23
View File
@@ -1,32 +1,12 @@
{ ... }: { pkgs-my-features, ... }:
{ {
nixpkgs.overlays = [
(self: super: {
octoprint = super.octoprint.override {
packageOverrides = pyself: pysuper: {
octoprint-fanspeedslider = pyself.buildPythonPackage rec {
pname = "fanspeedslider";
version = "0.2.3";
src = self.fetchFromGitHub {
owner = "mival";
repo = "OctoPrint-FanSpeedSlider";
rev = "${version}";
sha256 = "sha256-0Gp9EgaKyCnRQv4A1sNHquTRqjag2Oz/fDGVVo95FfY=";
};
propagatedBuildInputs = [ pysuper.octoprint ];
pyproject = true;
doCheck = false;
};
};
};
})
];
services.octoprint = { services.octoprint = {
enable = true; enable = true;
port = 8002; port = 8002;
package = pkgs-my-features.octoprint;
plugins = plugins =
plugins: with plugins; [ plugins: with plugins; [
octoprint-fanspeedslider fanspeedslider
]; ];
}; };
} }
+59
View File
@@ -0,0 +1,59 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
boot.loader.grub.useOSProber = true;
networking.hostName = "frog"; # Define your hostname.
networking.networkmanager.enable = true;
time.timeZone = "Europe/Rome";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "it_IT.UTF-8";
LC_IDENTIFICATION = "it_IT.UTF-8";
LC_MEASUREMENT = "it_IT.UTF-8";
LC_MONETARY = "it_IT.UTF-8";
LC_NAME = "it_IT.UTF-8";
LC_NUMERIC = "it_IT.UTF-8";
LC_PAPER = "it_IT.UTF-8";
LC_TELEPHONE = "it_IT.UTF-8";
LC_TIME = "it_IT.UTF-8";
};
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
services.xserver.xkb = {
layout = "us";
variant = "";
};
services.printing.enable = true;
services.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
environment.systemPackages = with pkgs; [
];
system.stateVersion = "25.11"; # Did you read the comment?
}
+6
View File
@@ -0,0 +1,6 @@
{ ... }:
{
imports = [
./configuration.nix
];
}
+26
View File
@@ -0,0 +1,26 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b3a05e5f-6394-4115-b206-8fb51c235067";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/c94fa719-f29a-41bb-8e85-e186fe96846c"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}
+3 -1
View File
@@ -1,6 +1,7 @@
{ {
pkgs, pkgs,
# pkgs-25-11, # pkgs-25-11,
pkgs-my-features,
lib, lib,
gamingSystem, gamingSystem,
workSystem, workSystem,
@@ -86,11 +87,12 @@
piper piper
qbittorrent qbittorrent
seahorse seahorse
spotiflac
telegram-desktop telegram-desktop
thunderbird thunderbird
vlc vlc
vulkan-tools vulkan-tools
pkgs-my-features.spotiflac
]; ];
gamingPackages = lib.optionals gamingSystem [ gamingPackages = lib.optionals gamingSystem [
+23 -14
View File
@@ -2,24 +2,33 @@ wifi_password: ENC[AES256_GCM,data:7plUlREKK8mNdWGhlTG5+3ICFqZq+hBp6aHz1mrLbOm9x
user_password: ENC[AES256_GCM,data:oRb4aO3iby+cA5YU5cyCeyOeSzZqd58/WozcHrK00VSHG01OnUZqpWbBa6zIm43UqfoZUM7IScWQZcWPbVR6t4H/uErZbZi2dQ==,iv:UzoJS290MWP7E/A1todnmyiNV3C8f5lg5h1Tf81QSPA=,tag:rvGNdn2I2TxVX8xDpDe/Vw==,type:str] user_password: ENC[AES256_GCM,data:oRb4aO3iby+cA5YU5cyCeyOeSzZqd58/WozcHrK00VSHG01OnUZqpWbBa6zIm43UqfoZUM7IScWQZcWPbVR6t4H/uErZbZi2dQ==,iv:UzoJS290MWP7E/A1todnmyiNV3C8f5lg5h1Tf81QSPA=,tag:rvGNdn2I2TxVX8xDpDe/Vw==,type:str]
sops: sops:
age: age:
- recipient: age18ujjw92tm6vpcpgqqky7dzg3yvzm9nytgzeptkfhtz5jhdskcdpsgmv0vs - enc: |
enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvM3dublNrNkQ2dlpJQUVP YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2QjFrS0Zhbm9KRk1VUy9h
MVE4c1hwdksyN3BtL1pWRXBISS9yaDRkNmhnCm5EQW4wTXZNQWxIYkhNVjh5TWFO MjNxMXU0UFB0MzZkeG1NV2hEN0lNcnBVczNvCitFWjk5ellheEpsUE16ZE8rbkZa
cGJGRHFBekwzMUJWZzc2NCtTNDV2ckEKLS0tIDJpN0UyK0sraExiOVk1UTN2dUEw QmtZUm51bHpyOGFGcDdscENZckh2SGcKLS0tIEJKVHNPY0hvRStCdjl5bDNjWmxx
ZjVBVUpBekJOaTZraEtWdEx2QU9VSWsKql10qo6BZUPZw/oXDQV0AlEihQnOi9Qd MlhmSFREVEdmaHhnb2lneWdPK0trK0UKyLnmxyb+1D4Rg40Vdt5j0ChSWDXc8Ft3
f4gtZWBFpy5EUXolgtbbJH0LPwKhi7hVvQk/PkOGq11jNnA6PQJ93w== UCIXrOebQlaJjbO3B8I2HkuOUtwg/SrljTa6SFwMlY2gZOhneEn/8g==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
- recipient: age1ynu6zhhy84rr5xqce0flp25x5tnfgskesxfe39u7ewsk900fvagq9sq0lx recipient: age18ujjw92tm6vpcpgqqky7dzg3yvzm9nytgzeptkfhtz5jhdskcdpsgmv0vs
enc: | - enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPN2R4cFZpOFlLcG4zVmlm YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvQkJQZVgrcW05TEEyYmRV
ZGF3MW9sb1NHOEhZY0UxNzF0TVIxanZHSFhFCkZYR01lUGFZaW9tbXhFZjg3UFB4 VjFuVW9nVFIzcVc5ZnpPQm1rRThPQ3d1RTNNCnhmUjc2RkxSNU81dXUwbWM3RGpM
dUhZNEduNUt3elFwSFRGYVF0Z3BZVWcKLS0tIC9oOUhER0JxWjg2OUhmTTI1ellE ZWZSNng0eDFoN0w0eDFia05mKzZqNGcKLS0tIGVIU2JMZXBIelFScWJGR2pCdWN4
NDN3c1J1dVcvY21uOUYrVFZMVXZXUTQK8GFPONewI3mzyG9Eh8PSjGVETsslyHiy akYvWXFVbXl6a0syY2FNdGhpSExKbGMKRzJDY2JPQoLG2MutoqQKzDfTT06QbsQz
ud/QT1fJFbjZzbKHu2RsFNYukLuoEodQ5t9ccGfWCpSfgddNXjGtHg== aukZRfGNouysaBvrXU7uasJ9KRvJQXjFRI/JRmkWicYR8oxXbkgSeQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
recipient: age1ynu6zhhy84rr5xqce0flp25x5tnfgskesxfe39u7ewsk900fvagq9sq0lx
- enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzb2laTm13VTRBeUpaS0VK
ZEUzL1g0M1A2ZzJudytPUnU2czNzbWdDMkhNCjVjOHBzcE8wQXdWZmt1eVl6VzBJ
bkhHMUczdG9sbCtMNVNUbDcraWovV2MKLS0tIEtuQ29rQk9PY0ZVTytMVGRGNGVt
dytEdkxoS3NtOFR0bHd0dmFUbEJ5b3cKju79g7jKN+m11YKHqTK+sNzXaw9j/gCI
EFS3/WCaFB4VI4olS0uzDsnsBzBywzgj/RTVwXYagzDkIqH2CAXRsw==
-----END AGE ENCRYPTED FILE-----
recipient: age1xfr76wj2hzz9mkxxce5qxgr2n72zsypatzhgl2fxgsh408wdzsaq39wt9z
lastmodified: "2026-03-07T16:01:24Z" lastmodified: "2026-03-07T16:01:24Z"
mac: ENC[AES256_GCM,data:Ni5qtsBcjKj9R2g78rdzd7+4tBL20SsU6aD5YZII/jaxjFxwFeVzfXuJruLnq3bEUiZShzOBVCc7gUi/6DaaluhXfltwwywu0QjJkPxfpGtQ7gmmiSDQAItwmj+9bJ/BFjx6ViBI/Vi1hnSRsS/gr1K0QkAzCT0JRehWi2HwnE4=,iv:rHWCfNa2hR6kB7lGB/VhPlB7MexgSFyWl5xyteQC3sk=,tag:6vBjVUIJLKDkJ7hjbkQXKw==,type:str] mac: ENC[AES256_GCM,data:Ni5qtsBcjKj9R2g78rdzd7+4tBL20SsU6aD5YZII/jaxjFxwFeVzfXuJruLnq3bEUiZShzOBVCc7gUi/6DaaluhXfltwwywu0QjJkPxfpGtQ7gmmiSDQAItwmj+9bJ/BFjx6ViBI/Vi1hnSRsS/gr1K0QkAzCT0JRehWi2HwnE4=,iv:rHWCfNa2hR6kB7lGB/VhPlB7MexgSFyWl5xyteQC3sk=,tag:6vBjVUIJLKDkJ7hjbkQXKw==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted