Add krdp for remote desktop

This commit is contained in:
Daniel Flanagan 2024-06-29 01:40:25 -05:00
parent 98f36353f4
commit 6469c70d3b
3 changed files with 35 additions and 17 deletions

View file

@ -346,6 +346,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1719468428,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719075281,
@ -425,6 +441,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable",
"pre-commit": "pre-commit", "pre-commit": "pre-commit",
"slippi": "slippi", "slippi": "slippi",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -476,7 +493,7 @@
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-unstable"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": [
"nixpkgs" "nixpkgs"

View file

@ -1,14 +1,13 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
disko.url = "github:nix-community/disko/master"; disko.url = "github:nix-community/disko/master";
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
# sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable"; sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs"; sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
pre-commit.url = "github:cachix/pre-commit-hooks.nix"; pre-commit.url = "github:cachix/pre-commit-hooks.nix";
@ -46,7 +45,7 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
# nixpkgs-unstable, nixpkgs-unstable,
disko, disko,
sops-nix, sops-nix,
pre-commit, pre-commit,
@ -119,7 +118,7 @@
overlays = with overlays; [ overlays = with overlays; [
additions additions
modifications modifications
# unstable-packages unstable-packages
]; ];
}; };
@ -136,12 +135,12 @@
final.helix = helix.outputs.packages.${prev.system}.helix; final.helix = helix.outputs.packages.${prev.system}.helix;
}; };
# unstable-packages = final: _prev: { unstable-packages = final: _prev: {
# final.unstable = import nixpkgs-unstable { unstable-packages = import nixpkgs-unstable {
# system = final.system; system = final.system;
# config.allowUnfree = true; config.allowUnfree = true;
# }; };
# }; };
}; };
nixosModules = import ./modules/nixos { nixosModules = import ./modules/nixos {

View file

@ -175,8 +175,8 @@
nixpkgs = { nixpkgs = {
overlays = with overlays; [ overlays = with overlays; [
additions additions
# modifications modifications
# unstable-packages unstable-packages
]; ];
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -383,9 +383,9 @@
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
services.xrdp.enable = true; # services.xrdp.enable = true;
services.xrdp.defaultWindowManager = "plasma"; # services.xrdp.defaultWindowManager = "plasma";
services.xrdp.openFirewall = false; # services.xrdp.openFirewall = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wl-clipboard wl-clipboard
@ -413,6 +413,8 @@
# kdePackages.kdevelop # kdePackages.kdevelop
# kdePackages.kdialog # kdePackages.kdialog
kdePackages.kdeplasma-addons kdePackages.kdeplasma-addons
unstable-packages.kdePackages.krdp
]; ];
programs.gnupg.agent = { programs.gnupg.agent = {