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

Update flatpak module, but not fully as my desktop code is not ready.

Browse Source
This commit is contained in:
GRMrGecko 2025-05-30 00:09:22 -05:00
parent 752e9cf6bc
commit 63c9782d6c
6 changed files with 32 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
flake.lock generated
View File

@ -20,37 +20,18 @@
"type": "github"
}
},
"flatpaks": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"systems": "systems"
},
"locked": {
"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"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1733572789,
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
"lastModified": 1747688870,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
"rev": "d5f1f641b289553927b3801580598d200a501863",
"type": "github"
},
"original": {
@ -81,38 +62,33 @@
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"nix-flatpak": {
"locked": {
"lastModified": 1747688870,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863",
"lastModified": 1739444422,
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"owner": "gmodena",
"ref": "latest",
"repo": "nix-flatpak",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1731755305,
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "NixOS",
"lastModified": 1748421225,
"narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
@ -134,62 +110,15 @@
"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": 1748421225,
"narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"disko": "disko",
"flatpaks": "flatpaks",
"home-manager": "home-manager_2",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"nixpkgs": "nixpkgs_3",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
"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";
};
flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
};
# Flake outputs, NixOS and Home Configurations.
outputs = inputs@{ self, flatpaks, ... }:
outputs = inputs@{ self, nix-flatpak, ... }:
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
flatpaks.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
config
];
};
@ -91,7 +91,7 @@
inherit settings;
};
modules = [
flatpaks.homeManagerModules.default
nix-flatpak.homeManagerModules.nix-flatpak
config
];
};

3
modules/home/flatpaks.nix
View File

@ -2,7 +2,6 @@
{
# Setup flatpaks.
services.flatpak.enableModule = true;
services.flatpak.remotes = {
"flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
};
@ -14,4 +13,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"
'';
initExtra = ''
initContent = ''
# Set emacs key binding.
bindkey -e
@ -54,4 +54,4 @@
${pkgs.fastfetch}/bin/fastfetch
'';
};
}
}

3
modules/nixos/users.nix
View File

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

3
users/main-user.nix
View File

@ -4,7 +4,6 @@
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 ]
@ -27,4 +26,4 @@
# the Home Manager release notes for a list of state version
# changes in each release.
home.stateVersion = "23.11";
}
}