tomasr/nixos
1
0
Fork 0
mirror of https://github.com/tomasriveral/nixos.git synced 2026-08-12 02:28:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from tomasriveral/laptop

Browse Source 
Laptop
This commit is contained in:
tomasr
2026-06-06 09:51:50 +02:00
committed by GitHub
parent 2207b5ef03 aca4458e4c
commit a0dd94cb3c
7 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+19 -6
View File
@@ -203,6 +203,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-local": {
"locked": {
"lastModified": 1780728942,
"narHash": "sha256-NjXPlIssFzJ8vazKaihsW773r/Kq2TTby7FKBlbWIg4=",
"path": "/home/tomasr/devel/fugit2-gpgme",
"type": "path"
},
"original": {
"path": "/home/tomasr/devel/fugit2-gpgme",
"type": "path"
}
},
"nixpkgs-notifier": { "nixpkgs-notifier": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@@ -228,11 +240,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1780336545, "lastModified": 1780365719,
"narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -244,11 +256,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1780203844, "lastModified": 1780453794,
"narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -313,6 +325,7 @@
"microPlugins-vivify": "microPlugins-vivify", "microPlugins-vivify": "microPlugins-vivify",
"nixos-grub-themes": "nixos-grub-themes", "nixos-grub-themes": "nixos-grub-themes",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-local": "nixpkgs-local",
"nixpkgs-notifier": "nixpkgs-notifier", "nixpkgs-notifier": "nixpkgs-notifier",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"notewrapper": "notewrapper" "notewrapper": "notewrapper"
flake.nix
+5 -1
View File
@@ -5,6 +5,9 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages
nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes"; nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes";
# This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone
nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -59,8 +62,9 @@
}; };
pkgs = mkPkgs inputs.nixpkgs; pkgs = mkPkgs inputs.nixpkgs;
pkgs-unstable = mkPkgs inputs.nixpkgs-unstable; pkgs-unstable = mkPkgs inputs.nixpkgs-unstable;
pkgs-local = mkPkgs inputs.nixpkgs-local;
in { in {
inherit pkgs pkgs-unstable; inherit pkgs pkgs-unstable pkgs-local;
}; };
} }
// (inputs.import-tree ./modules)); // (inputs.import-tree ./modules));
modules/applications/kdrive.nix
+3 -3
View File
@@ -11,9 +11,9 @@
enable = true; enable = true;
}; };
}; };
flake.nixosModules.kdrive-desktop = {pkgs-unstable, ...}: { flake.nixosModules.kdrive-desktop = {pkgs, ...}: {
environment.systemPackages = with pkgs-unstable; [ environment.systemPackages = [
rclone pkgs.rclone
self.packages.${pkgs.system}.custom-checkKdrive self.packages.${pkgs.system}.custom-checkKdrive
self.packages.${pkgs.system}.custom-synckdrive-desktop self.packages.${pkgs.system}.custom-synckdrive-desktop
]; ];
modules/applications/neovim.nix
+1 -1
View File
@@ -1,5 +1,5 @@
_: { _: {
flake.homeModules.neovim = {pkgs-unstable, ...}: { flake.homeModules.neovim = {pkgs-unstable, pkgs-local,...}: {
programs.neovim = { programs.neovim = {
withRuby = false; withRuby = false;
withPython3 = false; withPython3 = false;
modules/hosts/desktop.nix
+1 -1
View File
@@ -7,7 +7,7 @@
flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem {
#system = "x86_64-linux"; #system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit (self) pkgs-unstable; inherit (self) pkgs-unstable pkgs-local;
}; };
modules = with self.nixosModules; [ modules = with self.nixosModules; [
# important do not remove # important do not remove
modules/hosts/laptop.nix
+2 -2
View File
@@ -6,7 +6,7 @@
flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem {
#system = "x86_64-linux"; #system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit (self) pkgs-unstable; inherit (self) pkgs-unstable pkgs-local;
}; };
modules = with self.nixosModules; [ modules = with self.nixosModules; [
# important do not remove # important do not remove
@@ -104,7 +104,7 @@
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
inherit (self) pkgs-unstable; inherit (self) pkgs-unstable pkgs-local;
inherit self; inherit self;
}; };
}; };
modules/utilities/development.nix
+2
View File
@@ -31,6 +31,8 @@
ltex-ls-plus ltex-ls-plus
pylint pylint
black black
gnupg
pinentry-curses
inputs.nixpkgs-notifier.packages.${pkgs.system}.default inputs.nixpkgs-notifier.packages.${pkgs.system}.default
]; ];
}; };