Compare commits
No commits in common. "dea5300fb699e8cf22af343119f4905f31b82022" and "06984c42a0f9e8bbf8d282f2031923307eac4981" have entirely different histories.
dea5300fb6
...
06984c42a0
183
flake.lock
183
flake.lock
@ -20,11 +20,11 @@
|
||||
},
|
||||
"emacs": {
|
||||
"locked": {
|
||||
"lastModified": 1645674787,
|
||||
"narHash": "sha256-AhmEvep9SKfuMAobV2wELXoff7DQY7EjyDa8y3gtCgk=",
|
||||
"lastModified": 1645179483,
|
||||
"narHash": "sha256-Q11wkzvQvtUNgMpPxE0fofp5XT9K2wglhOi4nNG6nyg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "47052c17338916be9177893dd3c3b64f1a7a4bcb",
|
||||
"rev": "6a753da27cd3d5c0be49be6faaf2ed1feabdb240",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -63,46 +63,16 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645628011,
|
||||
"narHash": "sha256-iNZCTjJ63TN5oM6rx2f4H0zaCbXM/iup7UWtQuCuyTM=",
|
||||
"lastModified": 1645140957,
|
||||
"narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0b1745b4ef4c35ec5d554b176539730fcb5ec141",
|
||||
"rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -114,10 +84,7 @@
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"ostylk",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1643933536,
|
||||
@ -151,7 +118,7 @@
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639947939,
|
||||
@ -169,11 +136,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1645346782,
|
||||
"narHash": "sha256-3qd0cu+2kapIP7cdHW9n8zh1wCvRGg83K7/cCj5Xv+A=",
|
||||
"lastModified": 1644870092,
|
||||
"narHash": "sha256-RLPD92lqXW98LDIbbwYqwAbt3R4iD1V1PiylfgBq5cU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "1ccfe243aa6e94bf80f2a66f6be41d086d37fc87",
|
||||
"rev": "10eab1c4cd8e715c0b41d32c28af2b89fc67bed0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -201,8 +168,10 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
|
||||
"path": "/nix/store/96y8li2047jfsg5b6zasdaz9gvdw5ywg-source",
|
||||
"lastModified": 1642104392,
|
||||
"narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
|
||||
"path": "/nix/store/bfllm0im5z34n4v84zvip0kwy6vwl2yz-source",
|
||||
"rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
@ -228,11 +197,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1645433236,
|
||||
"narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=",
|
||||
"lastModified": 1644525281,
|
||||
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
|
||||
"rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -256,6 +225,19 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1642104392,
|
||||
"narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
|
||||
"path": "/nix/store/bfllm0im5z34n4v84zvip0kwy6vwl2yz-source",
|
||||
"rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1644750380,
|
||||
"narHash": "sha256-c4LvV88zB9YvM/6rLElbq4e62XtEO9pBINqsrlmH++M=",
|
||||
@ -271,12 +253,12 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1640233012,
|
||||
"narHash": "sha256-DNKMmWZ/RLoh5IVJLAa5HYOy4IW28mBBYDMgMxzzom8=",
|
||||
"path": "/nix/store/gf00nqfl948lq9b8sw2xz3fpirwq5amw-source",
|
||||
"rev": "611f29bedadfb2aa4c9c26c4af65f05dd35f2f3f",
|
||||
"lastModified": 1642104392,
|
||||
"narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
|
||||
"path": "/nix/store/bfllm0im5z34n4v84zvip0kwy6vwl2yz-source",
|
||||
"rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
@ -284,45 +266,29 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1645373091,
|
||||
"narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d0ae0897999e7ba4615e02ca1770df6065099daf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1645373091,
|
||||
"narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1642244250,
|
||||
"narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d0ae0897999e7ba4615e02ca1770df6065099daf",
|
||||
"rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-21.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1645675667,
|
||||
"narHash": "sha256-ZCRO9zrswTlH8Oa+4VnaDYSb4XfRJt7mGizZ51QvDLM=",
|
||||
"lastModified": 1645182018,
|
||||
"narHash": "sha256-esXJXkK70fvlztdhqE+tYJtQliwOfvZvvT/ZiwRGW6A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "56d2eccbdd80d84139e35f48f9b272e7c704f8cc",
|
||||
"rev": "9bfbaf7fcf989f4fe5ac3818f4e3d740d4d90143",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -338,17 +304,16 @@
|
||||
"home-manager": "home-manager_2",
|
||||
"impermanence": "impermanence",
|
||||
"nixos-hardware": "nixos-hardware_2",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"rnix-lsp": "rnix-lsp",
|
||||
"tablet-mode": "tablet-mode"
|
||||
"rnix-lsp": "rnix-lsp"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645661585,
|
||||
"narHash": "sha256-wuEbw7nlOn0scaju/5KIHoEJKHxLQhEvR/J1Ozilavw=",
|
||||
"lastModified": 1645134535,
|
||||
"narHash": "sha256-uevN8fmSoV1pCs4dNaPg78LfsGd5iQAVnEehp0R442o=",
|
||||
"ref": "master",
|
||||
"rev": "6de27f9c39e7aa1afd7e36489316f85fce5e8e79",
|
||||
"revCount": 166,
|
||||
"rev": "114a8d500801e1947e6572a41f6490f3864adcfb",
|
||||
"revCount": 160,
|
||||
"type": "git",
|
||||
"url": "https://dev.ostylk.de/NixDistro/Config"
|
||||
},
|
||||
@ -360,10 +325,7 @@
|
||||
"rnix-lsp": {
|
||||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": [
|
||||
"ostylk",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
@ -390,8 +352,7 @@
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nur": "nur",
|
||||
"ostylk": "ostylk",
|
||||
"stable": "stable",
|
||||
"tablet-mode": "tablet-mode_2"
|
||||
"stable": "stable"
|
||||
}
|
||||
},
|
||||
"stable": {
|
||||
@ -410,44 +371,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tablet-mode": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645650704,
|
||||
"narHash": "sha256-bAY4EDC2nLE10vz5nPTtky9Ri7RCu9N2yfCrPcjIQFs=",
|
||||
"ref": "master",
|
||||
"rev": "5046236ea223d00ea0e2c0d8d2b856d3f0d01454",
|
||||
"revCount": 12,
|
||||
"type": "git",
|
||||
"url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
|
||||
}
|
||||
},
|
||||
"tablet-mode_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645657720,
|
||||
"narHash": "sha256-qzUhfvNASfW9McIeV1UkKhkN39mDVmtDBHSLLoxTGJY=",
|
||||
"ref": "master",
|
||||
"rev": "9c4cfa67d08acd5bcacffa95e122da136d2b78e1",
|
||||
"revCount": 13,
|
||||
"type": "git",
|
||||
"url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1629481132,
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
nur.url = "github:nix-community/nur";
|
||||
ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
tablet-mode.url = "git+https://dev.ostylk.de/NixDistro/tablet-mode.git";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
@ -26,7 +25,7 @@
|
||||
}) eachDefaultLinuxSystem;
|
||||
mkSystem = import ./lib/mkSystem.nix {
|
||||
inherit inputs;
|
||||
inherit (inputs) nur emacs tablet-mode;
|
||||
inherit (inputs) nur emacs;
|
||||
inherit (nixpkgs) lib config;
|
||||
};
|
||||
in {
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
#xournalpp.enable = true;
|
||||
zsh.enable = true;
|
||||
#office.enable = true;
|
||||
plasma.enable = true;
|
||||
#plasma.enable = true;
|
||||
gaming.enable = true;
|
||||
};
|
||||
services = {
|
||||
@ -151,6 +151,7 @@
|
||||
wayland = true;
|
||||
enable = true;
|
||||
};
|
||||
desktopManager.plasma5.enable = true;
|
||||
};
|
||||
earlyoom.enable = lib.mkForce false;
|
||||
};
|
||||
|
||||
@ -52,7 +52,6 @@ in inputs.nixpkgs.lib.nixosSystem {
|
||||
# My module system
|
||||
(import ../modules)
|
||||
inputs.ostylk.nixosModules.nftables
|
||||
inputs.tablet-mode.nixosModules
|
||||
|
||||
# Actual config
|
||||
(import ./baseSystem.nix)
|
||||
|
||||
@ -47,9 +47,6 @@ in {
|
||||
sha256 = "1xj70n9agy41906jgm4yjmsx58i7pzsizpvv3rkzq78k95qjfmc9";
|
||||
};
|
||||
};
|
||||
|
||||
# from dev.ostylk.de/NixDistro/tablet-mode.git
|
||||
tablet-mode.enable = true;
|
||||
};
|
||||
|
||||
boot = {
|
||||
|
||||
@ -22,12 +22,11 @@ in {
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
#yakuake
|
||||
yakuake
|
||||
libsForQt5.okular
|
||||
libsForQt5.kdeconnect-kde
|
||||
libsForQt5.breeze-gtk
|
||||
libsForQt5.bismuth
|
||||
kde-rounded-corners
|
||||
index-fm
|
||||
#kasts-git
|
||||
rsibreak
|
||||
|
||||
@ -10,7 +10,7 @@ pkgs.discord.overrideAttrs (old: let
|
||||
binaryName = "Discord";
|
||||
system-electron = "$out/opt/${binaryName}/system-electron.sh";
|
||||
in rec {
|
||||
version = "0.0.17";
|
||||
version = "0.0.16";
|
||||
nativeBuildInputs = with pkgs.unstable; old.nativeBuildInputs ++ [ upstreamElectron asar ];
|
||||
buildPhase = ''
|
||||
${asar}/bin/asar e resources/app.asar resources/app
|
||||
|
||||
Loading…
Reference in New Issue
Block a user