GRMrGecko/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: GRMrGecko:19c1b7f62a174d1a5b84f7d00f7382fae0fcb65f
Branches Tags
GRMrGecko:main
..
compare: GRMrGecko:edddd33377946d2f6ac7a09eedbcd9b81c5222c5
Branches Tags
GRMrGecko:main

No commits in common. "19c1b7f62a174d1a5b84f7d00f7382fae0fcb65f" and "edddd33377946d2f6ac7a09eedbcd9b81c5222c5" have entirely different histories.
19c1b7f62a ... edddd33377

8 changed files with 124 additions and 43 deletions
Show Stats Expand all files Collapse all files

137
flake.lock generated
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1760701190,
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
"lastModified": 1744940522,
"narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=",
"owner": "nix-community",
"repo": "disko",
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
"rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081",
"type": "github"
},
"original": {
@ -20,18 +20,37 @@
"type": "github"
}
},
"home-manager": {
"flatpaks": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"systems": "systems"
},
"locked": {
"lastModified": 1747688870,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
"lastModified": 1733581530,
"narHash": "sha256-W+orHmF+XpZosrBFAFRs7sS1iVKYveg9SutkzSXMVsI=",
"owner": "GermanBread",
"repo": "declarative-flatpak",
"rev": "b88bd5b65f8e7c35eec0a90cfd6e096b2e7f79c0",
"type": "github"
},
"original": {
"owner": "GermanBread",
"ref": "stable-v3",
"repo": "declarative-flatpak",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1733572789,
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863",
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
"type": "github"
},
"original": {
@ -48,11 +67,11 @@
]
},
"locked": {
"lastModified": 1761666354,
"narHash": "sha256-fHr+tIYBJccNF8QWqgowfRmEAtAMSt1deZIRNKL8A7c=",
"lastModified": 1745033012,
"narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9",
"rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7",
"type": "github"
},
"original": {
@ -62,33 +81,38 @@
"type": "github"
}
},
"nix-flatpak": {
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1739444422,
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"lastModified": 1744743431,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github"
},
"original": {
"owner": "gmodena",
"ref": "latest",
"repo": "nix-flatpak",
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1751274312,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"owner": "nixos",
"lastModified": 1731755305,
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
@ -96,11 +120,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1761373498,
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
@ -110,15 +134,62 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1733412085,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1744440957,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"disko": "disko",
"home-manager": "home-manager",
"flatpaks": "flatpaks",
"home-manager": "home-manager_2",
"home-manager-unstable": "home-manager-unstable",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
}
},
"root": "root",

8
flake.nix
View File

@ -20,11 +20,11 @@
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
};
# Flake outputs, NixOS and Home Configurations.
outputs = inputs@{ self, nix-flatpak, ... }:
outputs = inputs@{ self, flatpaks, ... }:
let
# Load settings.nix or the default if not exists.
settings = (if (builtins.pathExists ./settings.nix)
@ -78,7 +78,7 @@
modules = [
inputs.disko.nixosModules.disko
home-manager.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
flatpaks.nixosModules.default
config
];
};
@ -91,7 +91,7 @@
inherit settings;
};
modules = [
nix-flatpak.homeManagerModules.nix-flatpak
flatpaks.homeManagerModules.default
config
];
};

3
modules/home/flatpaks.nix
View File

@ -2,6 +2,7 @@
{
# Setup flatpaks.
services.flatpak.enableModule = true;
services.flatpak.remotes = {
"flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
};
@ -13,4 +14,4 @@
"flathub:app/org.kde.krita/x86_64/stable"
"flathub:app/org.inkscape.Inkscape/x86_64/stable"
];
}
}

4
modules/home/zsh.nix
View File

@ -21,7 +21,7 @@
export VIDEO="mpv"
export OPENER="xdg-open"
'';
initContent = ''
initExtra = ''
# Set emacs key binding.
bindkey -e
@ -54,4 +54,4 @@
${pkgs.fastfetch}/bin/fastfetch
'';
};
}
}

2
modules/nixos/common.nix
View File

@ -111,7 +111,7 @@
};
gc = {
automatic = true;
dates = "Mon 3:40";
dates = "weekly";
options = "--delete-oder-than 7d";
};
};

3
modules/nixos/users.nix
View File

@ -33,7 +33,7 @@
};
environment.systemPackages = with pkgs; [
nodejs
nodejs_23
pure-prompt
fastfetch
home-manager
@ -47,6 +47,7 @@
users = {
${settings.user.name} = {
imports = [
inputs.flatpaks.homeManagerModules.default
../../users/main-user.nix
];
};

7
modules/nixos/virtualization.nix
View File

@ -30,6 +30,13 @@
package = pkgs.qemu_full;
runAsRoot = true;
swtpm.enable = true;
ovmf = {
enable = true;
packages = [(pkgs.OVMF.override {
secureBoot = true;
tpmSupport = true;
}).fd];
};
};
};

3
users/main-user.nix
View File

@ -4,6 +4,7 @@
imports = [
../modules/home/git.nix
../modules/home/zsh.nix
../modules/home/flatpaks.nix
] ++ (if (builtins.pathExists ../modules/home/profiles/${settings.profile}.nix)
then
[ ../modules/home/profiles/${settings.profile}.nix ]
@ -26,4 +27,4 @@
# the Home Manager release notes for a list of state version
# changes in each release.
home.stateVersion = "23.11";
}
}